From d3d8151e28e6d7cec84ef1ee5df4ab2e776bd9fc Mon Sep 17 00:00:00 2001 From: "Alan W. Irwin" Date: Sun, 25 Sep 2005 07:35:58 +0000 Subject: [PATCH] * libltdl/config/ltmain.m4sh (func_win32_libid) [ cygwin, mingw ]: Robustify sed script to determine win32_libid_type. (func_mode_link) [ mingw ]: Ignore `-lm'. --- ChangeLog | 8 ++++++++ libltdl/config/ltmain.m4sh | 15 +++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ded34447..83e5044dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-09-25 Alan W. Irwin , + Ralf Wildenhues + + * 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 * libltdl/libltdl/lt__private.h, libltdl/lt_error.c: diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index a1093ee6b..68f18bcdd 100644 --- 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 ;; -- 2.47.3