diff --git a/ChangeLog b/ChangeLog index 3de23c431..706fd1663 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-12-30 Andrew V. Samoilov + + * autogen.sh: Fix workaround for automake 1.5. + 2004-12-28 Leonard den Ottolander * syntax/spec.syntax: Set whole on spec macro option keywords. diff --git a/autogen.sh b/autogen.sh index c69115f94..8f009f8c9 100755 --- a/autogen.sh +++ b/autogen.sh @@ -90,8 +90,9 @@ test -f configure || \ { echo "autoconf failed to generate configure" 2>&1; exit 1; } # Workaround for Automake 1.5 to ensure that depcomp is distributed. -# Uncomment this for Automake 1.5 -#$AUTOMAKE -a src/Makefile +if test "`$AUTOMAKE --version|awk '{print $NF;exit}'`" = '1.5' ; then + $AUTOMAKE -a src/Makefile +fi $AUTOMAKE -a test -f Makefile.in || \ { echo "automake failed to generate Makefile.in" 2>&1; exit 1; }