Update NEWS and ChangeLog files

[ngircd-alex.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 5d4a8cf973439537273e70f0728127f86f52306c..c87085ac5cf030356cdba9b1846bf984b78795fd 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2004 Alexander Barton <alex@barton.de>
+# Copyright (c)2001-2008 Alexander Barton <alex@barton.de>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -9,11 +9,8 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: autogen.sh,v 1.13 2005/02/21 09:48:50 alex Exp $
-#
-
-#
-# Usage: [VAR=<value>] ./autogen.sh [<configure-args>]
+# Usage:
+#   [VAR=<value>] ./autogen.sh [<configure-args>]
 #
 # This script generates the ./configure script using GNU automake and
 # GNU autoconf. It tries to be smart in finding the correct/usable/available
@@ -124,13 +121,8 @@ if [ -z "$EXIST" ]; then
 fi
 [ "$VERBOSE" = "1" ] && echo "Using \"$EXIST\" to test for tools."
 
-# We want to use GNU automake 1.7, if available (WANT_AUTOMAKE is used by
-# the wrapper scripts of Gentoo Linux):
-WANT_AUTOMAKE=1.7
-export WANT_AUTOMAKE
-
 # Try to detect the needed tools when no environment variable already
-# spezifies one:
+# specifies one:
 echo "Searching tools ..."
 [ -z "$ACLOCAL" ] && ACLOCAL=`Search aclocal 1`
 [ "$VERBOSE" = "1" ] && echo "ACLOCAL=$ACLOCAL"
@@ -146,32 +138,35 @@ echo "Searching tools ..."
 [ -z "$GO" -a $# -gt 0 ] && GO=1
 
 # Verify that all tools have been found
-[ -z "$AUTOCONF" ] && Notfound autoconf
+[ -z "$ACLOCAL" ] && Notfound aclocal
 [ -z "$AUTOHEADER" ] && Notfound autoheader
 [ -z "$AUTOMAKE" ] && Notfound automake
 [ -z "$AUTOCONF" ] && Notfound autoconf
 
-export AUTOCONF AUTOHEADER AUTOMAKE AUTOCONF
+export ACLOCAL AUTOHEADER AUTOMAKE AUTOCONF
 
 # Generate files
 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