Spelling and minor grammar fixes.

[platform/upstream/automake.git] / configure.in

diff --git a/configure.in b/configure.in
index 2e5e685..d526e04 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 
-# Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,12 +18,19 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-AC_PREREQ(2.52)
-AC_INIT([GNU Automake], [1.6a], [bug-automake@gnu.org])
+AC_PREREQ(2.57b)
+AC_INIT([GNU Automake], [1.7a], [bug-automake@gnu.org])
 
 AC_CONFIG_SRCDIR(automake.in)
 AC_CONFIG_AUX_DIR(lib)
 
+AC_CANONICAL_BUILD
+
+# Save the AUTOCONF setting before AM_INIT_AUTOMAKE overrides it;
+# this way we can run Autoconf tests from configure without being
+# bothered by `missing'.
+am_AUTOCONF=${AUTOCONF-autoconf}
+
 AM_INIT_AUTOMAKE([1.6 dist-bzip2])
 
 # The API version is the base version.  We must guarantee
@@ -33,7 +40,7 @@ AM_INIT_AUTOMAKE([1.6 dist-bzip2])
 #   are compatible.  So 1.5.1c is compatible with 1.5.
 # * Prereleases on the trunk are all incompatible -- 1.5b and 1.5c
 #   aren't the same.
-APIVERSION=`echo "$VERSION" | sed -e 's/^\([[0-9]]*\.[[0-9]]*[[a-z]]?\).*$/\1/'`
+APIVERSION=`echo "$VERSION" | sed -e 's/^\([[0-9]]*\.[[0-9]]*[[a-z]]*\).*$/\1/'`
 AC_SUBST(APIVERSION)
 
 # A versioned directory, defined here for convenience.
@@ -41,9 +48,9 @@ pkgvdatadir="\${datadir}/automake-${APIVERSION}"
 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
@@ -53,27 +60,61 @@ $PERL -e 'require 5.005;' || {
    AC_MSG_ERROR([perl 5.005 or better is required])
 }
 
+# The test suite will skip some tests if tex is absent.
+AC_CHECK_PROG([TEX], [tex], [tex])
+
 # Test for Autoconf.  We run Autoconf in a subdirectory to ease
 # deletion of any files created (such as those added to
 # autom4te.cache).
 mkdir conftest
-echo 'AC''_PREREQ(2.52)' > conftest/conftest.ac
-AM_RUN_LOG([cd conftest && eval $AUTOCONF -o /dev/null conftest.ac]) || {
-   AC_MSG_ERROR([Autoconf 2.52 or better is required])
+echo 'AC''_PREREQ(2.54)' > conftest/conftest.ac
+AM_RUN_LOG([cd conftest && eval $am_AUTOCONF -o /dev/null conftest.ac]) || {
+   AC_MSG_ERROR([Autoconf 2.54 or better is required.
+  Is it installed?  Is it in your PATH?  (try running `autoconf --version')
+  Is it working?  See also config.log for error messages before this one.])
 }
 rm -rf conftest
 
-AC_CONFIG_FILES([automake], [chmod +x automake])
-AC_CONFIG_FILES([aclocal], [chmod +x aclocal])
+# Test for ln.  We need use it to install the versioned binaries.
+AC_MSG_CHECKING([whether ln works])
+AC_CACHE_VAL([am_cv_prog_ln], [
+rm -f conftest conftest.file
+: >conftest.file
+if ln conftest.file conftest 2>/dev/null; then
+  am_cv_prog_ln=ln
+else
+  am_cv_prog_ln='cp -p'
+fi
+rm -f conftest conftest.file])
+AC_SUBST([LN], [$am_cv_prog_ln])
+result=no
+test "x$am_cv_prog_ln" = xln && result=yes
+AC_MSG_RESULT([$result])
+
+# The amount we should wait after modifying files depends on the platform.
+# On Windows '95, '98 and ME, files modifications have 2-seconds
+# granularity and can be up to 3 seconds in the future w.r.t. the
+# system clock.  When it is important to ensure one file is older
+# than another we wait at least 5 seconds between creations.
+case $build in
+  *-pc-msdosdjgpp) MODIFICATION_DELAY=5;;
+  *)               MODIFICATION_DELAY=2;;
+esac
+AC_SUBST([MODIFICATION_DELAY])
+
+# Test for things needed by the test suite.
+AC_PROG_EGREP
+AC_PROG_FGREP
 
 AC_CONFIG_FILES([
   Makefile
   lib/Automake/Makefile
+  lib/Automake/tests/Makefile
   lib/Makefile
   lib/am/Makefile
   m4/Makefile
-  m4/amversion.m4:m4/amversion.in
   tests/Makefile
+  tests/defs
 ])
 
 AC_OUTPUT