Hi Jeff,
* Jeff Squyres wrote on Fri, Jul 01, 2005 at 03:46:29AM CEST:
> On Jun 30, 2005, at 3:06 AM, Ralf Wildenhues wrote:
> > To fix this in lamtests, the LAM guys would have to use CVS Autoconf
> > after the patch (or a different solution) has been accepted there, I
> > guess for both lam as well as lamtests.
>
> Could we apply a patch to the resulting 2.59-generated configure script
> for this problem?
Surely (well, as good as shipping patches against configure scrips work
anyway). The Autoconf patch has been accepted. If you would like me to
prepare one, I can do that for the SVN version of all of the lam/
lamtests configure scripts.
Meanwhile, would you mind putting this trivial patch in? It helps
select different choices of autotools without changing your code.
Regards,
Ralf
Index: autogen.sh
===================================================================
--- autogen.sh (revision 10170)
+++ autogen.sh (working copy)
@@ -4,6 +4,14 @@
#
# This script is run on developer copies of LAM/MPI -- *not*
# distribution tarballs.
+
+: ${ACLOCAL=aclocal}
+: ${AUTOCONF=autoconf}
+: ${AUTOMAKE=automake}
+: ${LIBTOOL=libtool}
+: ${LIBTOOLIZE=libtoolize}
+: ${AUTOHEADER=autoheader}
+
#
# Some helper functions
#
@@ -180,7 +188,7 @@
# Run the GNU tools
- run_and_check aclocal
+ run_and_check $ACLOCAL
# Patch aclocal.m4 for portland compilers
@@ -206,7 +214,7 @@
# bad version.
echo " -- second patch for PGI support in Libtool 1.5.14"
- if test "`libtoolize --version | head -n 1 | cut -d\ -f 4`" = "1.5.14"; then
+ if test "`$LIBTOOLIZE --version | head -n 1 | cut -d\ -f 4`" = "1.5.14"; then
patch -p0 < "$rgt_lam_topdir/config/patches/libtool-pgi-1.5.14.patch"
if test "$?" != "0"; then
echo "Patch badness! Exiting!"
@@ -223,16 +231,16 @@
if test "`grep AC_CONFIG_HEADER $file`" != "" -o \
"`grep AM_CONFIG_HEADER $file`" != ""; then
- run_and_check autoheader
+ run_and_check $AUTOHEADER
fi
- run_and_check autoconf
+ run_and_check $AUTOCONF
# We only need the libltdl stuff for the top-level
# configure, not any of the SSI modules.
if test -d share; then
rm -rf libltdl share/libltdl share/include/lam_ltdl.h
- run_and_check libtoolize --automake --copy --ltdl
+ run_and_check $LIBTOOLIZE --automake --copy --ltdl
mv libltdl share
echo "Adjusting libltdl for LAM :-("
@@ -265,9 +273,9 @@
mv configure.new configure
chmod a+x configure
else
- run_and_check libtoolize --automake --copy
+ run_and_check $LIBTOOLIZE --automake --copy
fi
- run_and_check automake --foreign -a --copy --include-deps
+ run_and_check $AUTOMAKE --foreign -a --copy --include-deps
fi
# Go back to the original directory
@@ -351,9 +359,9 @@
fi
fi
-test_for_existence autoconf
-test_for_existence automake
-test_for_existence libtool
+test_for_existence $AUTOCONF
+test_for_existence $AUTOMAKE
+test_for_existence $LIBTOOL
# Now do the run
|
