diff --git a/ChangeLog b/ChangeLog index 53ce3bf16..b88696260 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-12-10 Pavel S. Shirshov + + * autogen.sh: Comment workaround for Automake 1.5. It's not working + for Automake 1.9. + 2004-12-07 Roland Illig * syntax/Makefile.am: Don't install syntax highlighting files if diff --git a/autogen.sh b/autogen.sh index f46f30d12..c69115f94 100755 --- a/autogen.sh +++ b/autogen.sh @@ -90,7 +90,8 @@ test -f configure || \ { echo "autoconf failed to generate configure" 2>&1; exit 1; } # Workaround for Automake 1.5 to ensure that depcomp is distributed. -$AUTOMAKE -a src/Makefile +# Uncomment this for Automake 1.5 +#$AUTOMAKE -a src/Makefile $AUTOMAKE -a test -f Makefile.in || \ { echo "automake failed to generate Makefile.in" 2>&1; exit 1; }