* m4/libtool.m4 (_LT_SETUP, _LT_LANG_CXX_CONFIG, * _LT_LANG_F77_CONFIG):

For matching compiler names: Pick only first word, allow leading white
space..
* tests/sh.test: ..and test for missing `*' at end of patterns.

diff --git a/ChangeLog b/ChangeLog
index 856ff7b6e1f1e07f71fd36d273105082537164e8..0198798d77df3dea5fa36d397cf5eb8eb98a8280 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-05-21  Gary V. Vaughan  <gary@gnu.org>,
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * m4/libtool.m4 (_LT_SETUP, _LT_LANG_CXX_CONFIG, * _LT_LANG_F77_CONFIG):
+       For matching compiler names: Pick only first word, allow leading white
+       space..
+       * tests/sh.test: ..and test for missing `*' at end of patterns.
+
 2005-03-20  Peter Ekberg  <peda@lysator.liu.se>
 
        * m4/libtool.m4 (_LT_LINKER_SHLIBS) [ irix5, irix6, nonstopux ]:

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index b24b8347716b7683b3719a704d90e59c3a8f8f68..f7b0c785ef419aa6f2d198a886df02b4ad38fc9c 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -192,7 +192,8 @@ test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 test -z "$LD" && LD=ld
 test -z "$ac_objext" && ac_objext=o
 
-cc_basename=`$ECHO X"$compiler" | $Xsed -e 's%^.*/%%'`
+cc_basename=`$ECHO "X$compiler" \
+    | $Xsed -e 's%.*/%%;s%^[   ]*\([^  ]*\).*$%\1%'`
 
 # Only perform the check for file, if the check method requires it
 test -z "$MAGIC_CMD" && MAGIC_CMD=file
@@ -4675,7 +4676,8 @@ if test "$_lt_caught_CXX_error" != yes; then
   CC=${CXX-"c++"}
   compiler=$CC
   _LT_TAGVAR(compiler, $1)=$CC
-  cc_basename=`$ECHO X"$compiler" | $Xsed -e 's%^.*/%%'`
+  cc_basename=`$ECHO "X$compiler" \
+      | $Xsed -e 's%.*/%%;s%^[         ]*\([^  ]*\).*$%\1%'`
 
   if test -n "$compiler"; then
     # We don't want -fno-exception when compiling C++ code, so set the
@@ -5778,7 +5780,8 @@ if test "$_lt_caught_F77_error" != yes; then
   CC=${F77-"f77"}
   compiler=$CC
   _LT_TAGVAR(compiler, $1)=$CC
-  cc_basename=`$ECHO X"$compiler" | $Xsed -e 's%^.*/%%'`
+  cc_basename=`$ECHO "X$compiler" \
+      | $Xsed -e 's%.*/%%;s%^[         ]*\([^  ]*\).*$%\1%'`
 
   if test -n "$compiler"; then
     AC_MSG_CHECKING([if libtool supports shared libraries])

diff --git a/tests/sh.test b/tests/sh.test
index 84deb1123928cbf359e096a9fc257daf90e579f2..f8c9b7de6a47a10a9fdd63345e23923b8e494538 100755 (executable)
--- a/tests/sh.test
+++ b/tests/sh.test
@@ -105,4 +105,14 @@ func_foo ()
   fi
 done
 
+for s in "$srcdir/../m4/libtool.m4"
+do
+  if $SED -n '/case \$cc_basename in/,/esac/ {
+             /^[       ]*[a-zA-Z][a-zA-Z0-9+]*[^*][    ]*)/p
+             };'  $s | $EGREP .; then
+    echo "\$cc_basename matches should include a trailing \`*' in $s."
+    status=$EXIT_FAILURE
+  fi
+done
+
 exit $status