Fix func_infer_tag $ECHO usage; some testsuite exposure.

* libltdl/config/ltmain.m4sh (func_infer_tag): Use func_echo_all
rather than $ECHO for possibly multiple arguments.
* tests/infer-tag.at (inferred tag, CXX inferred tag)
(F77 inferred tag, FC inferred tag, GCJ inferred tag): New file,
new tests.
* Makefile.am: Adjust.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 949e7e54f7711a05f248a5158ef1955baa77b081..67955462c4cd2001852af189d1f716dd88de2764 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2008-11-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       Fix func_infer_tag $ECHO usage; some testsuite exposure.
+       * libltdl/config/ltmain.m4sh (func_infer_tag): Use func_echo_all
+       rather than $ECHO for possibly multiple arguments.
+       * tests/infer-tag.at (inferred tag, CXX inferred tag)
+       (F77 inferred tag, FC inferred tag, GCJ inferred tag): New file,
+       new tests.
+       * Makefile.am: Adjust.
+
        * tests/runpath-in-lalib.at (Runpath in libtool library files):
        Add $EXEEXT overlooked in patch yesterday.
 

diff --git a/Makefile.am b/Makefile.am
index a09ed3d1b3b4c328a23b121221974eeda6a1ac59..98feed423d85227cce745adc534a60bcab0363bc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -466,6 +466,7 @@ TESTSUITE_AT        = tests/testsuite.at \
                  tests/indirect_deps.at \
                  tests/archive-in-archive.at \
                  tests/execute-mode.at \
+                 tests/infer-tag.at \
                  tests/localization.at \
                  tests/install.at \
                  tests/destdir.at \

diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 0fe3fc908d51e1c257312d8c4eabc21abffde9ea..27691492e70571f0c33dc6823ab9c0bd63b80a42 100644 (file)
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -578,10 +578,13 @@ func_infer_tag ()
         func_quote_for_eval "$arg"
        CC_quoted="$CC_quoted $func_quote_for_eval_result"
       done
+      CC_expanded=`func_echo_all $CC`
+      CC_quoted_expanded=`func_echo_all $CC_quoted`
       case $@ in
       # Blanks in the command may have been stripped by the calling shell,
       # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
       # Blanks at the start of $base_compile will cause this to fail
       # if we don't check for them as well.
       *)
@@ -595,8 +598,11 @@ func_infer_tag ()
              func_quote_for_eval "$arg"
              CC_quoted="$CC_quoted $func_quote_for_eval_result"
            done
+           CC_expanded=`func_echo_all $CC`
+           CC_quoted_expanded=`func_echo_all $CC_quoted`
            case "$@ " in
-             " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
+           " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+           " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
              # The compiler in the base compile command matches
              # the one in the tagged configuration.
              # Assume this is the tagged configuration we want.

diff --git a/tests/infer-tag.at b/tests/infer-tag.at
new file mode 100644 (file)
index 0000000..ebc7581
--- /dev/null
+++ b/tests/infer-tag.at
@@ -0,0 +1,101 @@
+# infer-tag.at -- libtool without --tag             -*- Autotest -*-
+#
+#   Copyright (C) 2008 Free Software Foundation, Inc.
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from  http://www.gnu.org/licenses/gpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+####
+
+# Check that func_infer_tag works.
+
+# We add one test per tag, so that only those tests are skipped
+# for which the tags are disabled (otherwise we only ever test
+# on systems where all tags are enabled).
+
+AT_SETUP([inferred tag])
+AT_KEYWORDS([libtool])
+
+AT_DATA([a.c],
+[[int a (void) { return 0; }
+]])
+
+AT_CHECK([$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c],
+        [], [ignore], [ignore])
+
+AT_CLEANUP
+
+AT_SETUP([CXX inferred tag])
+LT_AT_TAG([CXX])
+AT_KEYWORDS([libtool])
+
+AT_DATA([a.cpp],
+[[int a (void) { return 0; }
+]])
+
+AT_CHECK([$LIBTOOL --mode=compile $CXX $CPPFLAGS $CXXFLAGS -c a.cpp],
+        [], [ignore], [ignore])
+
+AT_CLEANUP
+
+AT_SETUP([F77 inferred tag])
+LT_AT_TAG([F77])
+AT_KEYWORDS([libtool])
+
+AT_DATA([a.f],
+[[      program main
+      end
+]])
+
+AT_CHECK([$LIBTOOL --mode=compile $F77 $FFLAGS -c a.f],
+        [], [ignore], [ignore])
+
+AT_CLEANUP
+
+AT_SETUP([FC inferred tag])
+LT_AT_TAG([FC])
+AT_KEYWORDS([libtool])
+
+AT_DATA([a.f],
+[[      program main
+      end
+]])
+
+AT_CHECK([$LIBTOOL --mode=compile $FC $FCFLAGS -c a.f],
+        [], [ignore], [ignore])
+
+AT_CLEANUP
+
+AT_SETUP([GCJ inferred tag])
+LT_AT_TAG([GCJ])
+AT_KEYWORDS([libtool])
+
+AT_DATA([A.java],
+[[public class A {
+  private int a;
+  public A () { a = 0; }
+};
+]])
+
+# There are just too many broken gcj installations out there, either missing
+# libgcj.spec or unable to find it.  Skip this test for them.
+AT_CHECK([$GCJ $GCJFLAGS -c A.java || exit 77], [], [ignore], [ignore])
+
+AT_CHECK([$LIBTOOL --mode=compile $GCJ $GCJCFLAGS -c A.java],
+        [], [ignore], [ignore])
+
+AT_CLEANUP