Always cloak client hostname, if needed

[ngircd-alex.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 0f1458c52152e671c20dd362983b37e1af3d6b5d..c87085ac5cf030356cdba9b1846bf984b78795fd 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -121,20 +121,6 @@ if [ -z "$EXIST" ]; then
 fi
 [ "$VERBOSE" = "1" ] && echo "Using \"$EXIST\" to test for tools."
 
-# We want to use GNU automake 1.9, if available (WANT_AUTOMAKE is used by
-# the wrapper scripts of Gentoo Linux, AUTOMAKE_VERSION is used by OpenBSD);
-# same applies for GNU autoconf, we want to use version 2.59. -- But only
-# set these preferences if not already set!
-if [ -z "$AUTOMAKE_VERSION" -a -z "$WANT_AUTOMAKE" ]; then
-       AUTOMAKE_VERSION=1.9
-       WANT_AUTOMAKE=1.9
-fi
-if [ -z "$AUTOCONF_VERSION" -a -z "$WANT_AUTOCONF" ]; then
-       AUTOCONF_VERSION=2.59
-       WANT_AUTOCONF=2.59
-fi
-export AUTOMAKE_VERSION WANT_AUTOMAKE AUTOCONF_VERSION WANT_AUTOCONF
-
 # Try to detect the needed tools when no environment variable already
 # specifies one:
 echo "Searching tools ..."
@@ -164,20 +150,23 @@ echo "Generating files ..."
 $ACLOCAL && \
        $AUTOHEADER && \
        $AUTOMAKE --add-missing && \
-       $AUTOCONF
+       $AUTOCONF --force
 
 if [ $? -eq 0 -a -x ./configure ]; then
        # Success: if we got some parameters we call ./configure and pass
        # all of them to it.
+       NAME=`grep PACKAGE_STRING= configure | cut -d"'" -f2`
        if [ "$GO" = "1" ]; then
                [ -n "$PREFIX" ] && p=" --prefix=$PREFIX" || p=""
                [ -n "$*" ] && a=" $*" || a=""
                c="./configure${p}${a}"
+               echo "Okay, autogen.sh for $NAME done."
                echo "Calling \"$c\" ..."
                $c
                exit $?
        else
-               echo "Okay, autogen.sh done; now run the \"configure\" script."
+               echo "Okay, autogen.sh for $NAME done."
+               echo "Now run the \"./configure\" script."
                exit 0
        fi
 else