X-Git-Url: https://git.tokkee.org/?p=fusedav.git;a=blobdiff_plain;f=bootstrap.sh;h=d33398fecaa6ea286f4cac43142bd56d2da4c7ff;hp=173b9fb0a7a39fb212aa27af5805b52d41364e64;hb=8c36bfcceb83029525f099611a57c46113e4cc21;hpb=e33020ed1f2dd0dfe4d54053c225306c2f3cde41

diff --git a/bootstrap.sh b/bootstrap.sh
index 173b9fb..d33398f 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -17,29 +17,44 @@
 # along with fusedav; 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"
+    local V
+
+    V=$(echo "$2" | sed -e 's,\.,,g')
+    
+    if [ -e "`which $1$V`" ] ; then
+    	P="$1$V" 
+    else
+	if [ -e "`which $1-$2`" ] ; then
+	    P="$1-$2" 
+	else
+	    P="$1"
+	fi
+    fi
 
     shift 2
     "$P" "$@"
 }
 
+set -ex
+
 if [ "x$1" = "xam" ] ; then
-    set -ex
-    run_versioned automake 1.7 -a -c
+    run_versioned automake "$VERSION" -a -c --foreign
     ./config.status
 else 
-    set -ex
     rm -rf autom4te.cache
     rm -f config.cache
 
-    run_versioned aclocal 1.7
-    autoheader
-    run_versioned automake 1.7 -a -c
-    autoconf -Wall
-
-    CFLAGS="-g -O0" ./configure --sysconfdir=/etc "$@"
+    run_versioned aclocal "$VERSION"
+    run_versioned autoconf 2.59 -Wall
+    run_versioned autoheader 2.59
+    run_versioned automake "$VERSION" -a -c --foreign
 
-    make clean
+    if test "x$NOCONFIGURE" = "x"; then
+        CFLAGS="-g -O0" ./configure --sysconfdir=/etc "$@"
+        make clean
+    fi
 fi