From: Andreas Schwab <schwab@suse.de>
Date: Sun, 24 Jun 2001 22:32:25 +0000 (+0000)
Subject: * libtool.m4 (AC_LIBTOOL_SETUP): Remove failed try to
X-Git-Tag: release-1-4b~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3088fab90898a9f715c99c7a5b6002c275c2d9e3;p=thirdparty%2Flibtool.git

* libtool.m4 (AC_LIBTOOL_SETUP): Remove failed try to
transform linux to linux-gnu in $host.
(AC_LIBTOOL_SYS_DYNAMIC_LINKER): Match $host_os against
linux*, not linux-gnu*.
(AC_DEPLIBS_CHECK_METHOD): Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index bd225fa51..e5c7552ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-06-24  Andreas Schwab  <schwab@suse.de>
+
+	* libtool.m4 (AC_LIBTOOL_SETUP): Remove failed try to
+	transform linux to linux-gnu in $host.
+	(AC_LIBTOOL_SYS_DYNAMIC_LINKER): Match $host_os against
+	linux*, not linux-gnu*.
+	(AC_DEPLIBS_CHECK_METHOD): Likewise.
+
 2001-06-24  Gary V. Vaughan  <gary@gnu.org>
 
 	* libtool.m4 (_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR):  Set
@@ -9,7 +17,7 @@
 	(AC_PATH_TOOL_PREFIX): Ditto.
 	(AC_PATH_MAGIC): Ditto.
 	(AC_PATH_PROG_NM): Ditto.
-	
+
 	From Tim Van Holder  <tim.van.holder@pandora.be>:
 	* libtool.m4: Use the canonical absolute path test
 	([\\/]* | ?:[\\/]) and $PATH_SEPARATOR wherever
diff --git a/libtool.m4 b/libtool.m4
index 3f2c7a1fd..384b270a5 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -98,12 +98,6 @@ AC_LIBTOOL_OBJDIR
 AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
 _LT_AC_PROG_ECHO_BACKSLASH
 
-# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
-case $host_os in
-linux-gnu*) ;;
-linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
-esac
-
 case $host_os in
 aix3*)
   # AIX sometimes has problems with the GCC collect2 program.  For some
@@ -1161,12 +1155,12 @@ irix5* | irix6*)
   ;;
 
 # No shared lib support for Linux oldld, aout, or coff.
-linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
+linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
 # This must be Linux ELF.
-linux-gnu*)
+linux*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1845,7 +1839,7 @@ irix5* | irix6*)
   ;;
 
 # This must be Linux ELF.
-linux-gnu*)
+linux*)
   case $host_cpu in
   alpha* | i*86 | powerpc* | sparc* | ia64* )
     lt_cv_deplibs_check_method=pass_all ;;