X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/93fd2018161e66e6022f9a91ac1a646babfe0088..c970d57b7ce83c4fab023abee3afd6d414fc9ffc:/bootstrap?ds=sidebyside

diff --git a/bootstrap b/bootstrap
index e669a3cc36..1dd622bae5 100755
--- a/bootstrap
+++ b/bootstrap
@@ -9,7 +9,7 @@ PKG_NAME="GRAS"
 # a list of all dirs containing possibly some macros
 acmacrodirs="${HOME}/share/aclocal ${PWD}/acmacro /usr/share/aclocal/gnome2-macros"
 
-amver=1.7
+amver=1.8
 
 ######
 ###### End of conf part
@@ -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