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
Add tests for memcheck with perl.
[simgrid.git]
/
bootstrap
diff --git
a/bootstrap
b/bootstrap
index
faaf3c4
..
1e86b57
100755
(executable)
--- a/
bootstrap
+++ b/
bootstrap
@@
-7,7
+7,13
@@
# You can redistribute and/or modify it under the terms of the
# GNU LGPL (v2.1) licence.
# You can redistribute and/or modify it under the terms of the
# GNU LGPL (v2.1) licence.
-amversions="${amver:-1.10}"
+amversions="1.10 1.11"
+
+if [ ! -e bootstrap ] ; then
+ if [ -e ../bootstrap ] ; then
+ cd ..
+ fi
+fi
check_version()
{
check_version()
{
@@
-38,19
+44,19
@@
amver=`find_version automake ${amversions}`
lt=`which libtoolize`
if [ "x$lt" = "x" ] ; then
lt=`which libtoolize`
if [ "x$lt" = "x" ] ; then
- echo "Libtool not found. Please install the libtool package to proceed with a
CVS
checkout"
+ echo "Libtool not found. Please install the libtool package to proceed with a
SVN
checkout"
exit 1
fi
am=`which automake-$amver`
if [ "x$am" = "x" ] ; then
exit 1
fi
am=`which automake-$amver`
if [ "x$am" = "x" ] ; then
- echo "automake versions $amversions not found. Please install the relevant package to proceed with a
CVS
checkout"
+ echo "automake versions $amversions not found. Please install the relevant package to proceed with a
SVN
checkout"
exit 1
fi
ac=`which autoconf`
if [ "x$ac" = "x" ] ; then
exit 1
fi
ac=`which autoconf`
if [ "x$ac" = "x" ] ; then
- echo "autoconf not found. Please install the relevant package to proceed with a
CVS
checkout"
+ echo "autoconf not found. Please install the relevant package to proceed with a
SVN
checkout"
exit 1
fi
exit 1
fi
@@
-75,7
+81,7
@@
echo "----------------------------------"
echo
echo "Most common flags:"
echo
echo "Most common flags:"
-echo " --enable-maintainer-mode mandatory if you use the
CVS
version"
+echo " --enable-maintainer-mode mandatory if you use the
SVN
version"
echo " --disable-compile-optimizations useful if your gdb gets fooled"
echo
echo " --disable-compile-optimizations useful if your gdb gets fooled"
echo