remove unneeded and per-user cruft from bootstrap.sh

[catta] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 78f26c9d632c0cdc5a5e17d9712d31d47add7b2b..6aebf96d372ad2a111e018b3a5bc69e47618e9c5 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-# $Id$
 
 # This file is part of avahi.
 #
@@ -18,22 +17,23 @@
 # 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
     local V
 
     V=$(echo "$2" | sed -e 's,\.,,g')
-    
-    if [ -e "`which $1$V`" ] ; then
-       P="$1$V" 
+
+    if [ -e "`which $1$V 2> /dev/null`" ] ; then
+        P="$1$V"
     else
-       if [ -e "`which $1-$2`" ] ; then
-           P="$1-$2" 
-       else
-           P="$1"
-       fi
+        if [ -e "`which $1-$2 2> /dev/null`" ] ; then
+            P="$1-$2"
+        else
+            P="$1"
+        fi
     fi
 
     shift 2
@@ -43,29 +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
 
-    rm -f Makefile.am~ configure.ac~
-    # Evil, evil, evil, evil hack
-    sed 's/read dummy/\#/' `which gettextize` | sh -s -- --copy --force
-    test -f Makefile.am~ && mv Makefile.am~ Makefile.am
-    test -f configure.ac~ && mv configure.ac~ configure.ac
-
     test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize
-
-    intltoolize --copy --force --automake
     "$LIBTOOLIZE" -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
 
-    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