# along with this program. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ([2.69])
-AC_INIT([GNU Automake], [1.12.1a], [bug-automake@gnu.org])
+AC_INIT([GNU Automake], [1.12a], [bug-automake@gnu.org])
AC_CONFIG_SRCDIR([automake.in])
AC_CONFIG_AUX_DIR([lib])
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.
# $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
# 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
[], [am_score=1; break])
_AM_CHECK_SHELL_FEATURE([$1],
- [supports \${var@%:@glob}],
- [v=a/b/c; test ${v@%:@*/} = b/c],
+ [supports \${var@%:@glob} and \${var%glob}],
+ [v=a/b/c \
+ && test ${v@%:@*/} = b/c \
+ && test ${v@%:@@%:@*/} = c \
+ && test ${v%/*} = a/b \
+ && test ${v%%/*} = a],
[], [am_score=1; break])
_AM_CHECK_SHELL_FEATURE([$1],
- [supports \${var@%:@@%:@glob}],
- [v=a/b/c; test ${v@%:@@%:@*/} = c],
- [], [am_score=1; break])
-
- _AM_CHECK_SHELL_FEATURE([$1],
- [supports \${var%glob}],
- [v=a.b.c; test ${v%.*} = a.b],
- [], [am_score=1; break])
-
- _AM_CHECK_SHELL_FEATURE([$1],
- [supports \${var%%glob}],
- [v=a.b.c; test ${v%%.*} = a],
- [], [am_score=1; break])
-
- _AM_CHECK_SHELL_FEATURE([$1],
- ["set -e" preserves exit traps],
+ [preserves exit traps with "set -e"],
[set -e; trap 'exit $?' 0; (exit 77); exit 77],
[], [am_score=1; break])
_AM_CHECK_SHELL_FEATURE([$1],
- ["set -x" corrupts stderr],
+ [corrupts stderr with "set -x"],
[(set -x; P=1 true 2>&3) 3>&1 2>/dev/null | grep P=1],
[am_score=9], [])
[rm -f conftest-alias.sh],
[rm -f conftest-alias.sh; am_score=1; break])
+ _AM_CHECK_SHELL_FEATURE([$1],
+ [supports "test -e"],
+ [test -e config.log && test -e . && test ! -e nonesuch],
+ [], [am_score=1; break])
+
break
done])
AC_ARG_VAR([AM_TEST_RUNNER_SHELL],
[a sturdy POSIX shell for our testsuite])
-## ---------------------- ##
-## Create output files. ##
-## ---------------------- ##
-
###########################################################################
###########################################################################
+## ---------------------- ##
+## Create output files. ##
+## ---------------------- ##
+
AC_CONFIG_FILES([Makefile])
AC_CONFIG_LINKS([GNUmakefile:GNUmakefile])