call ./configure from bootstrap.sh

[catta] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index a9614a5c404daf8ef8c6c089a20ca556556b4ac3..6aebf96d372ad2a111e018b3a5bc69e47618e9c5 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-# $Id$
 
 # This file is part of avahi.
 #
@@ -18,13 +17,24 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-VERSION=1.9
+AM_VERSION=1.11
+AC_VERSION=2.63
 
 run_versioned() {
     local P
-    type -p "$1-$2" &> /dev/null && P="$1-$2" \
-       || type -p "$1`echo $2 | tr -d '.'`" &> /dev/null && P="$1`echo $2 | tr -d '.'`" \
-       || local P="$1"
+    local V
+
+    V=$(echo "$2" | sed -e 's,\.,,g')
+
+    if [ -e "`which $1$V 2> /dev/null`" ] ; then
+        P="$1$V"
+    else
+        if [ -e "`which $1-$2 2> /dev/null`" ] ; then
+            P="$1-$2"
+        else
+            P="$1"
+        fi
+    fi
 
     shift 2
     "$P" "$@"
@@ -33,25 +43,18 @@ run_versioned() {
 set -ex
 
 if [ "x$1" = "xam" ] ; then
-    run_versioned automake "$VERSION" -a -c --foreign
+    # re-run only automake (after changes to Makefile.am)
+    run_versioned automake "$AM_VERSION" -a -c --foreign
     ./config.status
 else 
     rm -rf autom4te.cache
     rm -f config.cache
 
-    run_versioned libtoolize 1.5 -c --force
-    run_versioned aclocal "$VERSION" -I common
-    run_versioned autoconf 2.59 -Wall
-    run_versioned autoheader 2.59
-    run_versioned automake "$VERSION" -a -c --foreign
+    test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize
+    "$LIBTOOLIZE" -c --force
 
-    if test "x$NOCONFIGURE" = "x"; then
-        ./configure "$@"
-        make clean
-    fi
+    run_versioned aclocal "$AM_VERSION" -I common
+    run_versioned autoconf "$AC_VERSION" -Wall
+    run_versioned autoheader "$AC_VERSION"
+    run_versioned automake "$AM_VERSION" -a -c --foreign
 fi
-
-# on FreeBSD i must copy this file
-# cp /usr/local/share/aclocal/libtool15.m4 common/
-# cp /usr/local/share/aclocal/pkg.m4 common/
-#./configure --disable-qt3 --disable-qt4 --disable-mono --disable-monodoc --disable-python --disable-dbus --disable-glib --disable-expat --disable-libdaemon --with-distro=none --disable-gtk --disable-xmltoman