X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=bootstrap.sh;h=acb153ddbcd09cdbea1b94987b7a28729a346805;hb=d76069e946b4e89c828c96340677e40f583080c9;hp=d50ba727f80c6327b84ce6bbb30c9f6337ac2b8c;hpb=d865d04651f5563c2b3257a8f2073c9eac5fcfe0;p=catta

diff --git a/bootstrap.sh b/bootstrap.sh
index d50ba72..acb153d 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -28,7 +28,7 @@ run_versioned() {
 
 if [ "x$1" = "xam" ] ; then
     set -ex
-    run_versioned automake 1.7 -a -c --foreign
+    run_versioned automake 1.9 -a -c --foreign
     ./config.status
 else 
     set -ex
@@ -36,13 +36,13 @@ else
     rm -rf autom4te.cache
     rm -f config.cache
 
-    run_versioned aclocal 1.7
+    run_versioned aclocal 1.9 -I common
     libtoolize -c --force
     autoheader
-    run_versioned automake 1.7 -a -c --foreign
+    run_versioned automake 1.9 -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