* libtool.m4 (mingw*, AC_PROG_LD): use tr for carriage return

stripping.
* ltconfig.in: ditto.
From Olly Betts <olly@muscat.co.uk>

diff --git a/ChangeLog b/ChangeLog
index f6c151eeb8b511a7af3e8b35d92d7ee14683fbf7..22492a50bb6c0c6cda9e7bb690efb30bd6cb377f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-08-03  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+
+       * libtool.m4 (mingw*, AC_PROG_LD): use tr for carriage return
+       stripping.
+       * ltconfig.in: ditto.
+       From Olly Betts <olly@muscat.co.uk>
 
 1999-08-02  Olly Betts  <olly@muscat.co.uk>
 

diff --git a/libtool.m4 b/libtool.m4
index 5b28813d52cbd5c7558907d0e3b404627e3e1a37..5794d4a54ca91d0d13e4def5661e012b445baad3 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -273,7 +273,13 @@ ac_prog=ld
 if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   AC_MSG_CHECKING([for ld used by GCC])
-  ac_prog=`($CC -print-prog-name=ld) 2>&5 | sed 's,\r$,,'`
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
   case "$ac_prog" in
     # Accept absolute paths.
 changequote(,)dnl

diff --git a/ltconfig.in b/ltconfig.in
index 9c98d02dab15deb195009475446def86d2fdfdd8..13631fb4a5d30d846206178e591ede766a62745d 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -1166,7 +1166,13 @@ if test -z "$LD"; then
     # Check if gcc -print-prog-name=ld gives a path.
     echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6
     echo "$progname:@LINENO@: checking for ld used by GCC" >&5
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | sed 's,\r$,,'`
+    case $host in
+    *-*-mingw*)
+      # gcc leaves a trailing carriage return which upsets mingw
+      ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+    *)
+      ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+    esac
     case "$ac_prog" in
     # Accept absolute paths.
     [\\/]* | [A-Za-z]:[\\/]*)