[PATCH] remove dead code from AC_DEPLIBS_CHECK_METHOD

[Scott James Remnant]

I appreciate the idea of leaving the old check_method assignments in
libtool.m4 AC_DEPLIBS_CHECK_METHOD after changing that arch to pass_all;
it makes it easy to quickly put back in case it breaks things.

There's no reason to keep this dead code around forever though, it slows
down the script slightly because it always runs and it makes it a little
harder to manually see which method will be used.

A good rule of thumb is probably therefore if an arch goes for more than
6 months, or one significant release without getting the change to
pass_all backed out again then the dead code can be removed.

The old code is always available through CVS, after all.

This patch removes the older code for darwin*, rhapsody*, irix5*,
irix6*, nonstopux*, osf3*, osf4* & osf5*.

It changes no functionality, these architectures have been using
pass_all for some time.

Scott
-- 
Have you ever, ever felt like this?
Had strange things happen?  Are you going round the twist?

diff -ruNp libtool-1.5~/ChangeLog libtool-1.5/ChangeLog
--- libtool-1.5~/ChangeLog      2003-04-14 23:48:00.000000000 +0100
+++ libtool-1.5/ChangeLog       2003-09-30 15:41:21.000000000 +0100
@@ -0,0 +1,5 @@
+2003-09-30  Scott James Remnant  <address@hidden>
+
+       * libtool.m4 (AC_DEPLIBS_CHECK_METHOD): Remove dead code
+       for platforms that have been using pass_all for some time now.
+
diff -ruNp libtool-1.5~/libtool.m4 libtool-1.5/libtool.m4
--- libtool-1.5~/libtool.m4     2003-04-14 22:58:23.000000000 +0100
+++ libtool-1.5/libtool.m4      2003-09-30 15:41:00.000000000 +0100
@@ -2091,8 +2091,6 @@ cygwin* | mingw* | pw32*)
   ;;
 
 darwin* | rhapsody*)
-  # this will be overwritten by pass_all, but leave it in just in case
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared 
library'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   case "$host_os" in
   rhapsody* | darwin1.[[012]])
@@ -2144,21 +2133,11 @@ hpux10.20* | hpux11*)
   ;;
 
 irix5* | irix6* | nonstopux*)
-  case $host_os in
-  irix5* | nonstopux*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - 
version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] 
dynamic lib MIPS - version 1"
-    ;;
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
   esac
   lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
   lt_cv_deplibs_check_method=pass_all
@@ -2205,8 +2184,6 @@ openbsd*)
   ;;
 
 osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
   lt_cv_file_magic_test_file=/shlib/libc.so
   lt_cv_deplibs_check_method=pass_all
   ;;

signature.asc
Description: This is a digitally signed message part