small build system updates

git-svn-id: file:///home/lennart/svn/public/heatload/trunk@20 3bca8330-beed-0310-b360-ea58cfc96e4b

1 files changed, 8 insertions, 7 deletions

diff --git a/bootstrap.sh b/bootstrap.sh
index 3ccb697..1442958 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -17,6 +17,8 @@
 # along with heatload; if not, write to the Free Software 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"
@@ -24,23 +26,22 @@ run_versioned() {
     shift 2
     "$P" "$@"
 }
+    
+set -ex
 
 if [ "x$1" = "xam" ] ; then
-    set -ex
-    run_versioned automake 1.8 -a -c --foreign
+    run_versioned automake "$VERSION" -a -c --foreign
     ./config.status
 else 
-    set -ex
-
     rm -rf autom4te.cache
     rm -f config.cache
 
-    run_versioned aclocal 1.8
+    run_versioned aclocal "$VERSION"
     autoheader
-    run_versioned automake 1.8 -a -c --foreign
+    run_versioned automake "$VERSION" -a -c --foreign
     autoconf -Wall
 
-    CFLAGS="-g -O0" ./configure --sysconfdir=/etc "$@"
+    CFLAGS="$CFLAGS -g -O0" ./configure --sysconfdir=/etc "$@"
 
     make clean
 fi