Improve code for requiring libtool and gettext in tests.

* tests/defs.in: Stricter (and more correct) detection of wheter
libtool, libtoolize and/or gettext are in $required.

diff --git a/ChangeLog b/ChangeLog
index 57918e95abfe03ce85961fdcddc7a1eaf84ed6ca..be0a240f430d306b7603dcf702b0a3fd8d97b8f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       Improve code for requiring libtool and gettext in tests.
+       * tests/defs.in: Stricter (and more correct) detection of wheter
+       libtool, libtoolize and/or gettext are in $required.
+
 2010-08-31  Peter Rosin  <peda@lysator.liu.se>
 
        Do file name conversion for object files in the compile wrapper.

diff --git a/tests/defs.in b/tests/defs.in
index b5cc99ed8da6fc605df38eea26925547609bd0cd..8544dbcded98de57101643a9eefc3df045a12602 100644 (file)
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -343,8 +343,8 @@ echo "=== Running test $0"
 # files from an old version of Automake that we don't want to use.
 # Use `-Wno-syntax' because we do not want our test suite to fail because
 # some third-party .m4 file is underquoted.
-case $required in
-  *libtool* | *gettext* )
+case " $required " in
+  *' libtool '* | *' libtoolize '* | *' gettext '* )
     aclocaldir='@prefix@/share/aclocal'
     extra_includes=""
     if test -f $aclocaldir/dirlist; then
@@ -365,9 +365,9 @@ case $required in
          gettext_found=yes
        fi
     done
-    case $required in
-      *libtool* ) test $libtool_found = yes || Exit 77 ;;
-      *gettext* ) test $gettext_found = yes || Exit 77 ;;
+    case " $required " in
+      *' libtool '* | *' libtoolize '* ) test $libtool_found = yes || Exit 77 ;;
+      *' gettext '* ) test $gettext_found = yes || Exit 77 ;;
     esac
     # Libtool cannot cope with spaces in the build tree.  Our testsuite setup
     # cannot cope with spaces in the source tree name for Libtool and gettext