* m4/libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS) [cygwin*, mingw*]:

when extracting symbols from an import lib (occurs if
--enable-shared --disable-static), the output of
$global_symbol_pipe is not the same as 	when extracting from a
static library (the default case). Add extra filters to
$export_symbols_cmds to process this sort of output in addition to
'normal' static-lib output.

diff --git a/ChangeLog b/ChangeLog
index 9dfe79146233b30857ab3318470f2f42cf61288a..03d56e4a84394d9d8f23130ee17f0a3b2ec9fcd2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-11-06  Charles Wilson  <cwilson@ece.gatech.edu>
+
+       * m4/libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS) [cygwin*, mingw*]:
+       when extracting symbols from an import lib (occurs if
+       --enable-shared --disable-static), the output of
+       $global_symbol_pipe is not the same as  when extracting from a
+       static library (the default case). Add extra filters to
+       $export_symbols_cmds to process this sort of output in addition to
+       'normal' static-lib output.
+
 2003-11-06  Charles Wilson  <cwilson@ece.gatech.edu>,
        Gary V. Vaughan  <gary@gnu.org>
 

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 4b5567e9ee5569bb26c7d6e12fe0c6e4a55c5794..a355c790d5873aae1c067c5b49d577715eeba943 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -5080,7 +5080,7 @@ ifelse([$1],[CXX],[
     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
   *)
     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'