* ltmain.in: Finish the tag matching logic started yesterday and

refactor it a bit.

diff --git a/ChangeLog b/ChangeLog
index fe7552f9552d5a5ffe87c408c36569a128448cfd..0ee7dac321004135428fd8a4a9794efe082daa61 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-02  Robert Boehne  <rboehne@gnu.org>
+
+       * ltmain.in: Finish the tag matching logic started yesterday and
+       refactor it a bit.
+
 2002-04-01  Robert Boehne  <rboehne@gnu.org>
 
        * ltmain.in: Handle the case when no tag is explicitly set, and

diff --git a/ltmain.in b/ltmain.in
index 7f38c122e8e7ca7b5da2839c3931ba993da44208..fc441239525165f46b424c10e6bf3a759fda3cfb 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -470,29 +470,22 @@ if test -z "$show_help"; then
       case $base_compile in
       # Blanks in the command may have been stripped by the calling shell,
       # but not from the CC environment variable when ltconfig was run.
-      "$CC "*) ;;
+      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
       # Blanks at the start of $base_compile will cause this to fail
       # if we don't check for them as well.
-      " $CC "*) ;;
-      "`$echo $CC` "*) ;;
-      " `$echo $CC` "*) ;;
       *)
        for z in $available_tags; do
          if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
            # Evaluate the configuration.
            eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
            case "$base_compile " in
-           "$CC "*)
+           "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
              # The compiler in the base compile command matches
              # the one in the tagged configuration.
              # Assume this is the tagged configuration we want.
              tagname=$z
              break
              ;;
-           "`$echo $CC` "*)
-             tagname=$z
-             break
-             ;;
            esac
          fi
        done
@@ -1523,29 +1516,22 @@ EOF
       case $base_compile in
       # Blanks in the command may have been stripped by the calling shell,
       # but not from the CC environment variable when ltconfig was run.
-      "$CC "*) ;;
+      "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
       # Blanks at the start of $base_compile will cause this to fail
       # if we don't check for them as well.
-      " $CC "*) ;;
-      "`$echo $CC` "*) ;;
-      " `$echo $CC` "*) ;;
       *)
        for z in $available_tags; do
          if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
            # Evaluate the configuration.
            eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
            case $base_compile in
-           "$CC "*)
+           "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
              # The compiler in $compile_command matches
              # the one in the tagged configuration.
              # Assume this is the tagged configuration we want.
              tagname=$z
              break
              ;;
-           "`$echo $CC` "*)
-             tagname=$z
-             break
-             ;;
            esac
          fi
        done