From d3e42dfb75b99b9e96fde0819bbdd926b4bf5d8a Mon Sep 17 00:00:00 2001 From: mquinson Date: Sun, 11 Jul 2004 22:28:43 +0000 Subject: [PATCH] Do not configure subdirs (since they are result of interupted make dir); adapt to the new AC_CONFIG_HEADERS git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@238 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- bootstrap | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/bootstrap b/bootstrap index b388f637e8..1dd622bae5 100755 --- a/bootstrap +++ b/bootstrap @@ -114,8 +114,9 @@ xlc ) am_opt=--include-deps;; esac -for coin in `find $srcdir -name configure.ac -print `\ - `find $srcdir -name configure.in -print` +#for coin in `find $srcdir -name configure.ac -print `\ +# `find $srcdir -name configure.in -print` +for coin in `ls $srcdir/configure.ac $srcdir/configure.in 2>/dev/null` do dr=`dirname $coin` if test -f $dr/NO-AUTO-GEN; then @@ -144,7 +145,10 @@ do if grep "^AM_CONFIG_HEADER" $configfile >/dev/null; then echo "Running autoheader in "`pwd`"..." autoheader || exit 1 - fi + else if grep "^AC_CONFIG_HEADERS" $configfile >/dev/null; then + echo "Running autoheader in "`pwd`"..." + autoheader || exit 1 + fi fi if grep "^AM_INIT_AUTOMAKE" $configfile >/dev/null; then echo "Running automake-$amver --gnu --add-missing $am_opt ..." automake-$amver --gnu --add-missing $am_opt || exit 1 -- 2.20.1