* ltconfig.in (opt_cr): Handle crlf sequences output by the

mingw toolchain.

diff --git a/ChangeLog b/ChangeLog
index 080e28eba7420df00c74e0b0c2752fb4a20a2413..d4e0e5d6d2e942eb1933101c535b41d117c6ac17 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-10-28  Olly Betts  <olly@muscat.co.uk>
 
+       * ltconfig.in (opt_cr):  Handle crlf sequences output by the
+       mingw toolchain.
+
        * libtool.m4:  Third time lucky, with Tor's patch.
 
 1999-10-19  Tor Lillqvist  <tml@iki.fi>

diff --git a/ltconfig.in b/ltconfig.in
index 1ac8498b9b6df33e0ab59e83ae12941bc087e049..b1eb47ebd0a13ce2b5bf2f0ee113b3820d256649 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -1797,6 +1797,14 @@ sysv4)
   ;;
 esac
 
+# Handle CRLF in mingw too chain
+opt_cr=
+case "$host_os" in
+mingw*)
+  opt_cr=`echo 'x?' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
 # If we're using GNU nm, then use its standard symbol codes.
 if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
   symcode='[ABCDGISTW]'
@@ -1806,7 +1814,7 @@ fi
 for ac_symprfx in "" "_"; do
 
   # Write the raw and C identifiers.
-  global_symbol_pipe="sed -n -e 's/^.*[        ]\($symcode\)[  ][      ]*\($ac_symprfx\)$sympat$/$symxfrm/p'"
+global_symbol_pipe="sed -n -e 's/^.*[  ]\($symcode\)[  ][      ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no