From: Stefano Lattarini Date: Wed, 2 Jun 2010 19:23:34 +0000 (+0200) Subject: Improve code for requiring libtool and gettext in tests. X-Git-Tag: ng-0.5a~351^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1482fda4a5702348a5cfe726c9ea8af476450ad;p=thirdparty%2Fautomake.git 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 57918e95a..be0a240f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-09-02 Stefano Lattarini + + 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 Do file name conversion for object files in the compile wrapper. diff --git a/tests/defs.in b/tests/defs.in index b5cc99ed8..8544dbcde 100644 --- 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