diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 805064844..90985da11 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. AC_PREREQ([2.69]) -AC_INIT([GNU Automake], [1.12.4a], [bug-automake@gnu.org]) +AC_INIT([GNU Automake], [1.12a], [bug-automake@gnu.org]) AC_CONFIG_SRCDIR([automake.in]) AC_CONFIG_AUX_DIR([lib]) @@ -40,7 +40,7 @@ dnl We call AC_PROG_CC in an unusual way, and only for use in our dnl testsuite, so also use 'no-dependencies' and 'no-define' among dnl the automake options to avoid bloating and potential problems. AM_INIT_AUTOMAKE([dist-xz filename-length-max=99 color-tests - parallel-tests silent-rules no-define no-dependencies]) + no-define no-dependencies]) ## Keep this on a line of its own, since it must be found and processed ## by the 'update-copyright' rule in our Makefile. @@ -65,8 +65,14 @@ AC_SUBST([system_acdir], ["\${datadir}/aclocal"]) # $AUTOMAKE and $ACLOCAL are always run after a "cd $top_srcdir", # hence '.' is really what we want for perllibdir, libdir, and acdir. -ACLOCAL="perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/aclocal\" --acdir=m4 -I m4" -AUTOMAKE="perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/automake\" --libdir=lib" +# Use '-I' with aclocal so that our own *.m4 files in m4/ gets included, +# not copied, in aclocal.m4. +ACLOCAL="\ + perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/aclocal\" \ + --automake-acdir=m4 --system-acdir=m4/acdir -I m4" +AUTOMAKE="\ + perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/automake\" \ + --libdir=lib" AC_PATH_PROG([PERL], [perl]) if test -z "$PERL"; then @@ -135,7 +141,7 @@ AC_CHECK_PROGS([LEX], [lex flex], [false]) # following tests, but some users were unable to figure out that their # installation was broken since --version appeared to work. -required_autoconf_version=2.62 +required_autoconf_version=2.65 AC_CACHE_CHECK([whether autoconf is installed], [am_cv_autoconf_installed], [if AM_RUN_LOG([$am_AUTOCONF --version]); then @@ -601,9 +607,7 @@ AC_SUBST([EXEEXT]) ## ---------------------- ## AC_CONFIG_FILES([Makefile]) - AC_CONFIG_LINKS([GNUmakefile:GNUmakefile]) -AC_CONFIG_LINKS([defs:defs]) AC_CONFIG_FILES([t/wrap/aclocal-${APIVERSION}:t/wrap/aclocal.in], [chmod +x t/wrap/aclocal-${APIVERSION}], |