From: Gary V. Vaughan <gary@gnu.org>
Date: Sat, 16 Dec 2000 03:35:35 +0000 (+0000)
Subject: * ltconfig.in (deplibs_check_method, file_magic_cmd,
X-Git-Tag: multi-language-merge-point~103
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=469b2229a906f43ed5f73af3538ab71990700661;p=thirdparty%2Flibtool.git

* ltconfig.in (deplibs_check_method, file_magic_cmd,
file_magic_test_file): Arghh!  I keep forgetting that this stuff
has been moved...
* libtool.m4 (lt_cv_deplibs_check_method, lt_cv_file_magic_cmd,
lt_cv_file_magic_test_file): ...to here.  Now fixed (again).
---

diff --git a/ChangeLog b/ChangeLog
index 47404f345..5f529ad42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2000-12-16  Gary V. Vaughan  <gvv@techie.com>
 
+	* ltconfig.in (deplibs_check_method, file_magic_cmd,
+	file_magic_test_file): Arghh!  I keep forgetting that this stuff
+	has been moved...
+	* libtool.m4 (lt_cv_deplibs_check_method, lt_cv_file_magic_cmd,
+	lt_cv_file_magic_test_file): ...to here.  Now fixed (again).
+
 	* doc/libtool.texi (Libltdl interface):  Add documentation.
 	* libltdl/ltdl.h (lt_dlmakeresident, lt_dlisresident):  Add
 	prototypes.
@@ -9,6 +15,7 @@
 	module from being lt_dlclosed.
 	(lt_dlopen):  If lt_dlopen()ing self, make the module resident.
 	(lt_dlclose):  Return an error if the module is resident.
+	
 2000-12-16  Nick Hudson  <skrll@netbsd.org>
 
 	* ltconfig.in (netbsd*, deplibs_check_method): Enable ILD support
diff --git a/libtool.m4 b/libtool.m4
index 894d1adbc..9c4d0cce4 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -604,14 +604,19 @@ linux-gnu*)
   ;;
 
 netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then :
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    [lt_cv_deplibs_check_method='file_magic NetBSD/[a-z0-9]* demand paged shared library']
   else
-    changequote(,)dnl
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-    changequote([, ])dnl
-    lt_cv_file_magic_cmd='/usr/bin/file -L'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object']
   fi
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+  ;;
+
+newsos6)
+  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
   ;;
 
 osf3* | osf4* | osf5*)
diff --git a/ltconfig.in b/ltconfig.in
index 7157f9589..f3053cd10 100755
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -1114,15 +1114,11 @@ netbsd*)
     library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
-    deplibs_check_method='file_magic NetBSD/[a-z0-9]* demand paged shared library'
   else
     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
     soname_spec='${libname}${release}.so$major'
     dynamic_linker='NetBSD ld.elf_so'
-    deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB shared object'
   fi
-  file_magic_cmd='/usr/bin/file -L'
-  file_magic_test_file=`echo /usr/lib/libc.so*`
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
@@ -1133,9 +1129,6 @@ newsos6)
   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
-  file_magic_cmd=/usr/bin/file
-  deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  file_magic_test_file=/usr/lib/libnls.so
   ;;
 
 openbsd*)