# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-AC_PREREQ(2.54)
+AC_PREREQ(2.57b)
AC_INIT([GNU Automake], [1.7a], [bug-automake@gnu.org])
AC_CONFIG_SRCDIR(automake.in)
AC_SUBST(pkgvdatadir)
# $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
-# hence `.' is really what we want for perllibdir and libdir.
-ACLOCAL="perllibdir=./lib `pwd`/aclocal --acdir=m4 -I `pwd`/m4"
-AUTOMAKE="perllibdir=./lib `pwd`/automake --libdir=lib"
+# hence `.' is really what we want for perllibdir, libdir, and acdir.
+ACLOCAL="perllibdir=`pwd`/lib:./lib `pwd`/aclocal --acdir=m4"
+AUTOMAKE="perllibdir=`pwd`/lib:./lib `pwd`/automake --libdir=lib"
AC_PATH_PROG(PERL, perl)
if test -z "$PERL"; then