Simplify autogen.sh by using autoreconf

diff --git a/autogen.sh b/autogen.sh
index 168f747..22b6ff2 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,71 +1,25 @@
 #!/bin/sh
 #!/bin/sh

-# autogen.sh -- Use this script to create generated files from the GIT distribution
-# Taken from glib CVS
+# autogen.sh -- Use this script to create/update GNU Build System files from
+#               ther GIT distribution.

 
 

-PROJECT=grip
-TEST_TYPE=-f
-TEST_FILE=src/grip.c
-
-ACLOCAL_FLAGS="${ACLOCAL_FLAGS} -I config"
-
-# ChangeLog is generated from git log output using "make changelog"
-touch ChangeLog
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd ${srcdir}
-
-DIE=0
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "You must have autoconf installed to compile $PROJECT."
-    echo "Download the appropriate package for your distribution,"
-    echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-    DIE=1
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "You must have automake installed to compile $PROJECT."
-    echo "Get ftp://sourceware.cygnus.com/pub/automake/automake-1.4.tar.gz"
-    echo "(or a newer version if it is available)"
-    DIE=1
-}
+set -e

 
 

-(libtoolize --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "You must have libtool installed to compile $PROJECT."
-    echo "Visit http://www.gnu.org/software/libtool/ for more information."
-    DIE=1
-}
+# To test that we are really in the top-level directory
+TEST_FILE=src/grip.c

 
 

-if test "${DIE}" -eq 1; then
+test -f ${TEST_FILE} || {
+    echo "Error: You must run this script in the top-level project directory"

     exit 1
     exit 1

-fi
+}

 
 

-test ${TEST_TYPE} ${TEST_FILE} || {
-    echo "You must run this script in the top-level $PROJECT directory"
+(autoreconf --version) < /dev/null > /dev/null 2>&1 || {
+    echo "Error: You must have autoreconf installed to generate the GNU Build System files."

     exit 1
 }
 
     exit 1
 }
 

-case ${CC} in
-    *xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
-esac
-
-aclocal ${ACLOCAL_FLAGS}
-
-libtoolize --force --copy
-
-# Optionally feature autoheader
-(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
-
-automake --add-missing --copy ${am_opt}
-
-autoconf
+# ChangeLog is generated from git log output using "make changelog"
+touch ChangeLog

 
 

-cd ${ORIGDIR}
+autoreconf -v --install --force

 
 rm -rf autom4te.cache
 
 rm -rf autom4te.cache