1 files changed, 10 insertions, 6 deletions

diff --git a/autogen.sh b/autogen.sh
index dacf40e..bac5247 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,9 +1,13 @@
 #!/bin/sh
 
-aclocal -I m4/ $ACLOCAL_FLAGS --install || exit 1
-libtoolize --copy --force || exit 1
-autoheader || exit 1
-autoconf || exit 1
-automake -a -c || exit 1
+test -n "${srcdir}" || srcdir=`dirname "$0"`
+test -n "${srcdir}" || srcdir="$(pwd)"
 
-[ "$NOCONFIGURE" ] || ./configure CFLAGS="$CFLAGS -Wall" --enable-maintainer-mode "$@"
+olddir="$(pwd)"
+cd "$srcdir"
+
+intltoolize
+autoreconf -i
+
+cd "$olddir"
+"$srcdir/configure" --enable-maintainer-mode "$@"