diff options
| author | Bruno Haible <bruno@clisp.org> | 2006-07-14 11:38:54 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:13:30 +0200 |
| commit | 6d35d9456672d81e0fdcfa99fa37832db693b716 (patch) | |
| tree | 59fc706db426a994105c8e91a27a551b7bd0af3b /gettext-tools | |
| parent | f8f0df7c53c25bb9dc62fadf650370a141a29a1c (diff) | |
| download | external_gettext-6d35d9456672d81e0fdcfa99fa37832db693b716.zip external_gettext-6d35d9456672d81e0fdcfa99fa37832db693b716.tar.gz external_gettext-6d35d9456672d81e0fdcfa99fa37832db693b716.tar.bz2 | |
Freedom to use newer autoconf versions.
Diffstat (limited to 'gettext-tools')
| -rw-r--r-- | gettext-tools/examples/ChangeLog | 7 | ||||
| -rw-r--r-- | gettext-tools/examples/hello-c++-kde/admin/cvs.sh | 15 |
2 files changed, 17 insertions, 5 deletions
diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog index a97ac5d..b332d21 100644 --- a/gettext-tools/examples/ChangeLog +++ b/gettext-tools/examples/ChangeLog @@ -1,5 +1,12 @@ 2006-07-13 Bruno Haible <bruno@clisp.org> + * hello-c++-kde/admin/cvs.sh: Disable the search for specific + versions of autoconf, autoheader, autom4te, automake, aclocal. + Accept autoconf, autoheader versions > 2.59. Accept automake + versions > 1.8.x. + +2006-07-13 Bruno Haible <bruno@clisp.org> + * Makefile.am (ACLOCAL_AMFLAGS): New variable. 2006-07-03 Bruno Haible <bruno@clisp.org> diff --git a/gettext-tools/examples/hello-c++-kde/admin/cvs.sh b/gettext-tools/examples/hello-c++-kde/admin/cvs.sh index 97488e4..023d9ef 100644 --- a/gettext-tools/examples/hello-c++-kde/admin/cvs.sh +++ b/gettext-tools/examples/hello-c++-kde/admin/cvs.sh @@ -29,7 +29,7 @@ check_autotool_versions() { AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1` case $AUTOCONF_VERSION in - Autoconf*2.5* | autoconf*2.5* ) : ;; + Autoconf*2.[5-9]* | autoconf*2.[5-9]* ) : ;; "" ) echo "*** AUTOCONF NOT FOUND!." echo "*** KDE requires autoconf 2.52, 2.53 or 2.54" @@ -44,7 +44,7 @@ esac AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1` case $AUTOHEADER_VERSION in - Autoconf*2.5* | autoheader*2.5* ) : ;; + Autoconf*2.[5-9]* | autoheader*2.[5-9]* ) : ;; "" ) echo "*** AUTOHEADER NOT FOUND!." echo "*** KDE requires autoheader 2.52 or 2.53 (part of autoconf)" @@ -64,7 +64,7 @@ case $AUTOMAKE_STRING in echo "*** KDE requires automake 1.6" exit 1 ;; - automake*1.[678].* | automake*1.7* ) : ;; + automake*1.[6-9].* | automake*1.7* ) : ;; "" ) echo "*** AUTOMAKE NOT FOUND!." echo "*** KDE requires automake 1.6" @@ -473,8 +473,13 @@ if test -f Makefile.am.in; then makefile_wo=Makefile.am.in.wo fi -# Suck in the AUTOCONF detection code -. $admindir/detect-autoconf.sh +# Sucking AUTOCONF detection code - commented out +#. $admindir/detect-autoconf.sh +AUTOCONF="autoconf" +AUTOHEADER="autoheader" +AUTOM4TE="autom4te" +AUTOMAKE="automake" +ACLOCAL="aclocal -I m4" ### ### Main |