* libltdl/config/ltmain.m4sh (func_win32_libid)

[ cygwin, mingw ]: Robustify sed script to determine
win32_libid_type.
(func_mode_link) [ mingw ]: Ignore `-lm'.

diff --git a/ChangeLog b/ChangeLog
index 1ded344472425168d0d6952c4b4dc9d4d83573f1..83e5044dca9159cef01acf561d251c4ff87e8c5d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-09-25  Alan W. Irwin  <irwin@beluga.phys.uvic.ca>,
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * libltdl/config/ltmain.m4sh (func_win32_libid)
+       [ cygwin, mingw ]: Robustify sed script to determine
+       win32_libid_type.
+       (func_mode_link) [ mingw ]: Ignore `-lm'.
+
 2005-09-25  Peter Ekberg  <peda@lysator.liu.se>
 
        * libltdl/libltdl/lt__private.h, libltdl/lt_error.c:

diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index a1093ee6b07ba8a12e9d5bfa4ff14b37b5fc7352..68f18bcdd1ae14e6c41430e3b97df7027fb93b76 100644 (file)
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -681,12 +681,11 @@ func_win32_libid ()
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
        $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
       win32_nmres=`eval $NM -f posix -A $1 |
-       sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
-      if test "X$win32_nmres" = "Ximport" ; then
-       win32_libid_type="x86 archive import"
-      else
-       win32_libid_type="x86 archive static"
-      fi
+       sed -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
     fi
     ;;
   *DLL*)
@@ -2597,11 +2596,11 @@ func_mode_link ()
       -l*)
        if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
          case $host in
-         *-*-cygwin* | *-*-pw32* | *-*-beos*)
+         *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
            # These systems don't actually have a C or math library (as such)
            continue
            ;;
-         *-*-mingw* | *-*-os2*)
+         *-*-os2*)
            # These systems don't actually have a C library (as such)
            test "X$arg" = "X-lc" && continue
            ;;