diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | INSTALL | 4 | ||||
| -rwxr-xr-x | autogen.sh | 18 | ||||
| -rw-r--r-- | configure.ac | 2 |
4 files changed, 19 insertions, 14 deletions
@@ -1,3 +1,12 @@ +2004-08-29 Michael Koch <konqueror@gmx.de> + + * configure.ac: Depend on automake 1.9. + * INSTALL: Likewise. + * INSTALL: Updated to depend on automake 1.9 and libtool 1.5. + * autogen.sh: Likewise. + * configure.ac (AM_INIT_AUTOMAKE): Depend on automake 1.9, support + long paths in dist tarball. + 2004-08-28 Mark Wielaard <mark@klomp.org> * java/util/TimeZone.java (defaultZone): Try a couple of ways to get @@ -20,8 +20,8 @@ Suggested Software aclocal.m4, or config.h.in. - GNU autoconf 2.59+ - - GNU automake 1.7+ - - GNU libtool 1.4.2+ + - GNU automake 1.9+ + - GNU libtool 1.5+ When working from CVS you can run the above tools by executing ./autogen.sh in the source directory. diff --git a/autogen.sh b/autogen.sh index f4f4ea5dc..236c7a620 100755 --- a/autogen.sh +++ b/autogen.sh @@ -4,7 +4,7 @@ set -e LIBTOOLIZE=libtoolize ${LIBTOOLIZE} --version | head -n 1 -echo "libtoolize: minimum version required: 1.4.2" +echo "libtoolize: minimum version required: 1.5" AUTOCONF=autoconf ${AUTOCONF} --version | head -n 1 @@ -16,23 +16,19 @@ ${AUTOHEADER} --version | head -n 1 echo "autoheader: minimum version required: 2.59" AUTOMAKE=automake -if test -x /usr/bin/automake-1.8; then - AUTOMAKE=/usr/bin/automake-1.8 -elif test -x /usr/bin/automake-1.7; then - AUTOMAKE=/usr/bin/automake-1.7 +if test -x /usr/bin/automake-1.9; then + AUTOMAKE=/usr/bin/automake-1.9 fi ${AUTOMAKE} --version | head -n 1 -echo "automake: minimum version required: 1.7.0" +echo "automake: minimum version required: 1.9.0" # Aclocal is part of automake ACLOCAL=aclocal -if test -x /usr/bin/aclocal-1.8; then - ACLOCAL=/usr/bin/aclocal-1.8 -elif test -x /usr/bin/aclocal-1.7; then - ACLOCAL=/usr/bin/aclocal-1.7 +if test -x /usr/bin/aclocal-1.9; then + ACLOCAL=/usr/bin/aclocal-1.9 fi ${ACLOCAL} --version | head -n 1 -echo "aclocal: minimum version required: 1.7.0" +echo "aclocal: minimum version required: 1.9.0" echo "libtoolize ..." ${LIBTOOLIZE} --force --copy diff --git a/configure.ac b/configure.ac index e1d8f5568..0a5123bf9 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ CLASSPATH_MODULE="-module -version-info ${LIBVERSION}" AC_SUBST(CLASSPATH_MODULE) AC_PREREQ(2.59) -AM_INIT_AUTOMAKE(1.7.0) +AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar]) AC_CONFIG_HEADERS([include/config.h]) AC_PREFIX_DEFAULT(/usr/local/classpath) |