X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/84a89984e34dca1e9164a6995a8815483f87bf51..9554a10817ff4ae4cdcaecf0b5b1633e04530a35:/bootstrap

diff --git a/bootstrap b/bootstrap
index 3054e63c01..edef272f7f 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,44 +1,57 @@
-#!/bin/sh -e
+#!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
-amver=1.8
+amver=1.9
 
-# AUTOCONF=
-# AUTOHEADER=
-# AUTOPOINT=
-# LIBTOOLIZE=
 
-ACLOCAL="aclocal-$amver -I acmacro -I /usr/share/aclocal/gnome2-macros" \
-AUTOMAKE="automake-$amver" \
-  autoreconf -v || exit 1
-
-if test -z "$*"; then
-  if test -e aci.conf ; then
-    source aci.conf
-    echo "**Warning**: I am going to run \`configure' with arguments resulting from aci_configurator execution."
-    echo "ie, $configure_args."
-    echo "If you wish to pass other ones, please specify them on the"
-    echo \`$0\'" command line, or rerun aci_configurator and save the new ones."
-    echo
-  else
-    configure_args="--enable-maintainer-mode --enable-gtk-doc"
-    echo "**Warning**: I am going to run \`configure' with the default arguments."
-    echo "ie, $configure_args."
-    echo "If you wish to pass any to it, please specify them on the"
-    echo \`$0\'" command line."
-    echo
-  fi
-else
-  configure_args="$@"
-  echo "I am going to run \`configure' with the provided arguments."
-  echo "ie, $configure_args."
+lt=`which libtoolize`
+if [ "x$lt" = "x" ] ; then
+  echo "Libtool not found. Please install the libtool package to proceed with a CVS checkout"
+  exit 1
 fi
 
-echo "************"
-echo "* Running ./configure $configure_args..."
-echo "************"
-./configure $configure_args || exit 1
+am=`which automake-$amver`
+if [ "x$am" = "x" ] ; then
+  echo "automake version $amver not found. Please install the relevant package to proceed with a CVS checkout"
+  exit 1
+fi
 
-echo Now type \`make\' to compile the package
+ac=`which autoconf`
+if [ "x$ac" = "x" ] ; then
+  echo "autoconf not found. Please install the relevant package to proceed with a CVS checkout"
+  exit 1
+fi
 
+set -e
+# AUTOCONF=
+# AUTOHEADER=
+# AUTOPOINT=
+# LIBTOOLIZE=
 
+ACLOCAL="aclocal-$amver -I acmacro" \
+AUTOMAKE="automake-$amver" \
+  autoreconf -v -i -s || exit 1
+
+echo
+echo "And now, please launch ./configure"
+echo "----------------------------------"
+
+# What to do the day we declare optional modules using ACI:
+#  if test -e aci.conf ; then
+#   source aci.conf
+#   pass the content of $configure_args to configure
+
+echo 
+echo "Most common flags:"
+echo "  --enable-maintainer-mode         mandatory if you use the CVS version"
+echo "  --disable-compile-optimizations  useful if your gdb gets fooled"
+echo
+
+echo 
+echo "If you want to compile for several archs from the same (nfs-mounted?) tree, do:"
+echo "  mkdir your_arch; cd your_arch && ../configure --srcdir=.."
+
+echo 
+echo "(after configure, you'll naturally have to run \`make')"
+echo 
+echo