A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
please close the structure behind you
[simgrid.git]
/
bootstrap
diff --git
a/bootstrap
b/bootstrap
index
25e00ab
..
1dd622b
100755
(executable)
--- a/
bootstrap
+++ b/
bootstrap
@@
-8,7
+8,9
@@
PKG_NAME="GRAS"
# a list of all dirs containing possibly some macros
acmacrodirs="${HOME}/share/aclocal ${PWD}/acmacro /usr/share/aclocal/gnome2-macros"
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.8
+
######
###### End of conf part
######
######
###### End of conf part
######
@@
-57,10
+59,10
@@
DIE=0
}
}
}
}
-(automake-
1.7
--version) < /dev/null > /dev/null 2>&1 || {
+(automake-
$amver
--version) < /dev/null > /dev/null 2>&1 || {
echo
echo
- echo "**Error**: You must have \`automake'
1.7
installed to compile $PKG_NAME."
- echo "Get ftp://ftp.gnu.org/pub/gnu/automake-
1.7
.tar.gz"
+ echo "**Error**: You must have \`automake'
$amver
installed to compile $PKG_NAME."
+ echo "Get ftp://ftp.gnu.org/pub/gnu/automake-
amver
.tar.gz"
echo "(or a newer version if it is available)"
DIE=1
NO_AUTOMAKE=yes
echo "(or a newer version if it is available)"
DIE=1
NO_AUTOMAKE=yes
@@
-112,8
+114,9
@@
xlc )
am_opt=--include-deps;;
esac
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
do
dr=`dirname $coin`
if test -f $dr/NO-AUTO-GEN; then
@@
-137,15
+140,18
@@
do
libtoolize --force --copy || exit 1
fi
fi
libtoolize --force --copy || exit 1
fi
fi
- echo "Running aclocal-
1.7
$aclocalinclude..."
- aclocal-
1.7
$aclocalinclude
+ echo "Running aclocal-
$amver
$aclocalinclude..."
+ aclocal-
$amver
$aclocalinclude
if grep "^AM_CONFIG_HEADER" $configfile >/dev/null; then
echo "Running autoheader in "`pwd`"..."
autoheader || exit 1
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
if grep "^AM_INIT_AUTOMAKE" $configfile >/dev/null; then
- echo "Running automake-
1.7
--gnu --add-missing $am_opt ..."
- automake-
1.7
--gnu --add-missing $am_opt || exit 1
+ echo "Running automake-
$amver
--gnu --add-missing $am_opt ..."
+ automake-
$amver
--gnu --add-missing $am_opt || exit 1
fi
echo "Running autoconf..."
autoconf || exit 1
fi
echo "Running autoconf..."
autoconf || exit 1