X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=bootstrap.sh;h=d24de757efb015e99afb7984b12a0b41f95397cb;hb=91c63aa9b11519356a319d28a134fa3693da02a9;hp=6fe0f86dffac5a2332d89542285fedc140538ece;hpb=7005f3d52cce3992c42b8c1b10744c8e020e5086;p=catta

diff --git a/bootstrap.sh b/bootstrap.sh
index 6fe0f86..d24de75 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -18,6 +18,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
+VERSION=1.9
+
 run_versioned() {
     local P
     type -p "$1-$2" &> /dev/null && P="$1-$2" || local P="$1"
@@ -28,7 +30,7 @@ run_versioned() {
 
 if [ "x$1" = "xam" ] ; then
     set -ex
-    run_versioned automake 1.7 -a -c --foreign
+    run_versioned automake "$VERSION" -a -c --foreign
     ./config.status
 else 
     set -ex
@@ -36,13 +38,13 @@ else
     rm -rf autom4te.cache
     rm -f config.cache
 
-    run_versioned aclocal 1.7
+    run_versioned aclocal "$VERSION" -I common
     libtoolize -c --force
     autoheader
-    run_versioned automake 1.7 -a -c --foreign
+    run_versioned automake "$VERSION" -a -c --foreign
     autoconf -Wall
 
-    CFLAGS="-g -O0" ./configure --sysconfdir=/etc --localstatedir=/var "$@"
+    CFLAGS="$CFLAGS -g -O0" ./configure --sysconfdir=/etc --localstatedir=/var "$@"
 
     make clean
 fi