Don't punish non-DJGPP/non-Windows platforms..., rev. 3 [PATCH]

[Richard Dawe]

Hello.

Here's revision 3 of the patch to make the delay after modification
dependent on the platform. Changes:

* configure.in: Use $build, not $target.
* configure.in: Don't cache the test result.

2003-03-31  Richard Dawe  <address@hidden>

        * configure.in: Get the build platform name.  Define
        MODIFICATION_DELAY as the time to wait after modifying a file,
        to cope with timestamp granularity issues, depending
        on the build platform.
        * tests/defs.in: Define `sleep' using MODIFICATION_DELAY.

Let me know if this is OK and I will commit it, when I get a CVS account
at sources.redhat.com.

Thanks, bye, Rich =]

Index: configure.in
===================================================================
RCS file: /cvs/automake/automake/configure.in,v
retrieving revision 1.123
diff -p -u -3 -r1.123 configure.in
--- configure.in        1 Dec 2002 10:54:40 -0000       1.123
+++ configure.in        2 Apr 2003 20:32:59 -0000
@@ -24,6 +24,8 @@ AC_INIT([GNU Automake], [1.7a], [bug-aut
 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'.
@@ -87,6 +89,19 @@ 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.
+AC_MSG_CHECKING([how many seconds we should wait after modifying a file])
+case $build in
+  *-pc-msdosdjgpp) result=5;;
+  *)               result=2;;
+esac
+AC_SUBST([MODIFICATION_DELAY], [$result])
 AC_MSG_RESULT([$result])
 
 # Test for things needed by the test suite.
Index: tests/defs.in
===================================================================
RCS file: /cvs/automake/automake/tests/defs.in,v
retrieving revision 1.12
diff -p -u -3 -r1.12 defs.in
--- tests/defs.in       20 Feb 2003 12:28:37 -0000      1.12
+++ tests/defs.in       2 Apr 2003 20:33:06 -0000
@@ -269,11 +269,10 @@ export AUTOMAKE ACLOCAL
 EGREP='@EGREP@'
 FGREP='@FGREP@'
 
-# 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.
-sleep='sleep 5'
+# The amount we should wait after modifying files depends on the platform.
+# For instance, Windows '95, '98 and ME have 2-second granularity
+# and can be up to 3 seconds in the future w.r.t. the system clock.
+sleep='sleep @MODIFICATION_DELAY@'
 
 # The tests call `make -e' but we do not want $srcdir from the evironment
 # to override the definition from the Makefile.