A better fix for a timestamp issue: make sure that various

libtool.m4's are not newer than aclocal.m4.  They "usually weren't",
but if you had a slow filesystem, it could be possible that libtool.m4
would be newer than aclocal.m4, and Bad Things would happen during
"make" (i.e., running configure again).

This commit was SVN r22715.

Makefile.am

@@ -9,7 +9,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2006-2008 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2006-2010 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -25,4 +25,4 @@ include examples/Makefile.include
 dist-hook:
 	csh "$(top_srcdir)/config/distscript.csh" "$(top_srcdir)" "$(distdir)" "$(OMPI_VERSION)" "$(OMPI_SVN_R)"
 
-ACLOCAL_AMFLAGS = -I config -I opal/config -I ompi/config -I orte/config
+ACLOCAL_AMFLAGS = -I config

autogen.sh

@@ -10,7 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2007-2008 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2007-2010 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -505,6 +505,14 @@ EOF
                 patch -N -p0 < ../../../config/lt224-icc.diff > /dev/null 2>&1
                 rm -f libtool.m4.orig
                 rm -f libtool.m4.rej
+
+                # We must touch aclocal.m4 here, because it must be
+                # newer than libtool.m4, otherwise a whole bunch of
+                # Automake-mandated timestamps may be off (depending
+                # on the resolution of timestamps on your
+                # filesystem).
+                touch -r ../aclocal.m4 libtool.m4
+
                 cd ../../..
                 patched=1
             fi
@@ -559,6 +567,7 @@ EOF
                 patch -N -p0 < lt224-icc.diff > /dev/null 2>&1
                 rm -f libtool.m4.orig
                 rm -f libtool.m4.rej
+                # We'll touch aclocal.m4 below (see comment below).
                 cd ..
                 patched=1
             fi
@@ -592,6 +601,11 @@ EOF
         patch -N -p0 < config/lt-sun-fortran.diff > /dev/null 2>&1
         rm -f libtool.m4.orig
         rm -f libtool.m4.rej
+        # We must touch aclocal.m4 here, because it must be newer than
+        # libtool.m4, otherwise a whole bunch of Automake-mandated
+        # timestamps may be off (depending on the resolution of
+        # timestamps on your filesystem).
+        touch -r aclocal.m4 config/libtool.m4
     fi
 
     run_and_check $ompi_autoconf