Simplify autogen.sh

By using autoreconf

https://bugs.freedesktop.org/show_bug.cgi?id=61334

1 files changed, 4 insertions, 52 deletions

diff --git a/autogen.sh b/autogen.sh
index 1d1ddb93..41548878 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,58 +1,10 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
-set -e
- 
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-ARGV0=$0
-
-if test -z "$ACLOCAL_FLAGS"; then
-    acdir=`aclocal --print-ac-dir`
-    if [ ! -f $acdir/pkg.m4 ]; then
-    echo "$ARGV0: Error: Could not find pkg-config macros."
-    echo "        (Looked in $acdir/pkg.m4)"
-    echo "        If pkg.m4 is available in /another/directory, please set"
-    echo "        ACLOCAL_FLAGS=\"-I /another/directory\""
-    echo "        Otherwise, please install pkg-config."
-    echo ""
-    echo "pkg-config is available from:"
-    echo "http://www.freedesktop.org/software/pkgconfig/"
-    exit 1
-    fi
-fi
-
-if test -z "$*"; then
-    echo "$ARGV0:Note: \`./configure' will be run with no arguments."
-	echo "If you wish to pass any to it, please specify them on the"
-	echo "\`$0' command line."
-  echo
-fi
-
-do_cmd() {
-    echo "$ARGV0: running \`$@'"
-    $@
-}
-
-# not required for shared-mime-info, skip.
-# do_cmd libtoolize --force --copy
-
-do_cmd intltoolize --force
-
-do_cmd aclocal ${ACLOCAL_FLAGS}
-
-do_cmd autoheader
-
-do_cmd automake --add-missing
-
-do_cmd autoconf
-
-cd $ORIGDIR || exit $?
+echo "autogen.sh: running: intltoolize --force"
+intltoolize --force || exit 1
+autoreconf -vif || exit 1
 
 if test -z "$NOCONFIGURE"; then
-    do_cmd $srcdir/configure --enable-maintainer-mode ${1+"$@"} && echo "Now type \`make' to compile" || exit 1
+    ./configure --enable-maintainer-mode "$@" && echo "Now type \`make' to compile" || exit 1
 fi