* libtool.m4 [netbsd*] (deplibs_check_method, file_magic_cmd,

file_magic_test_file): Removed inappropriate duplicate
definitions; these variables are set in AC_DEPLIBS_CHECK_METHOD.

diff --git a/ChangeLog b/ChangeLog
index de3b44eddeb1c032adbbae059baa4536550ae0e0..8ed5ebef6c7795e089c7f1b4a7999835ce67b622 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2000-09-30  Alexandre Oliva  <aoliva@redhat.com>
 
+       * libtool.m4 [netbsd*] (deplibs_check_method, file_magic_cmd,
+       file_magic_test_file): Removed inappropriate duplicate
+       definitions; these variables are set in AC_DEPLIBS_CHECK_METHOD.
+
        * libtool.m4 (lt_cv_file_magic_cmd): Don't use '${MAGIC_CMD}' or
        '${OBJDUMP}'; Solaris' /bin/sh loses with `}' in cache files.
        (ac_cv_path_MAGIC_CMD): Renamed to lt_cv_path_MAGIC_CMD.

diff --git a/libtool.m4 b/libtool.m4
index 8724376888b6f3e7119bdea946666d94c965024e..130acde070b4637cfea6109c41a660041e1090ed 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -1711,9 +1711,6 @@ netbsd*)
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    [deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object']
-    file_magic_cmd=/usr/bin/file
-    file_magic_test_file=`echo /usr/lib/libc.so*`
     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'