Reverted incorrect patch:

2001-10-24  H.J. Lu  <hjl@gnu.org>
* ltmain.sh: Allow link against an archive when building a
shared library.
* libtool.m4 (lt_cv_deplibs_check_method): Always use
file_magic for Linux ELF.

diff --git a/ChangeLog b/ChangeLog
index 20939b15c91b622cc512db1278e2fddaf649791d..556b6c4245e754f4a16cbbd3c95b20deee5b9ca6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-02-07  Alexandre Oliva  <aoliva@redhat.com>
+
+       Reverted incorrect patch:
+       2001-10-24  H.J. Lu  <hjl@gnu.org>
+       * ltmain.sh: Allow link against an archive when building a
+       shared library.
+       * libtool.m4 (lt_cv_deplibs_check_method): Always use
+       file_magic for Linux ELF.
+
 2002-01-30  Robert Boehne  <rboehne@ricardo-us.com>
 
        * libtool.m4 (LT_AC_PROG_SED): Removed a mysterious newline.

diff --git a/libtool.m4 b/libtool.m4
index f914b181f3c85722f28f7b5dc07b54df4c5219e8..497f70889246e4c38ca150ba0562af5d7bf04939 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -1949,7 +1949,6 @@ linux*)
     # glibc up to 2.1.1 does not perform some relocations on ARM
     lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
   esac
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
   ;;
 

diff --git a/ltmain.in b/ltmain.in
index 00082f58d1dc57393ea0328e70f2ba59b056160e..89ee68fe52828dd4832320b09209e634644dd583 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -2990,13 +2990,6 @@ EOF
                        *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
                        esac
                      done
-                     # It is ok to link against an archive when
-                     # building a shared library.
-                     if $AR -t $potlib > /dev/null 2>&1; then
-                       newdeplibs="$newdeplibs $a_deplib"
-                       a_deplib=""
-                       break 2
-                     fi
                      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
                         | ${SED} 10q \
                         | egrep "$file_magic_regex" > /dev/null; then