diff --git a/autogen.sh b/autogen.sh
index df0e774b6d45c536bf006f24dbf9ad222b053c98..a639131d8aad119c586b9d2d549c1d6522896544 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
-#! /bin/sh
+#!/bin/sh -e
-# Generate config.h.in
-echo "touch stamp-h"
-touch stamp-h
+rm -rf config.cache build
+mkdir build
+
+# create po/Makefile.in.in
+glib-gettextize --force --copy
# add aclocal.m4 to current dir
echo "aclocal..."
# add aclocal.m4 to current dir
echo "aclocal..."
-aclocal
-
-# rerun libtoolize
-echo "libtoolize..."
-libtoolize --force
+aclocal -I m4
# This generates the configure script from configure.in
echo "autoconf..."
# This generates the configure script from configure.in
echo "autoconf..."
# Generate Makefile.in from Makefile.am
echo "automake..."
# Generate Makefile.in from Makefile.am
echo "automake..."
-automake --add-missing
+automake --add-missing $AUTOMAKE_FLAGS
# configure
# configure
-echo "./configure $*"
-./configure $*
+if test x$NOCONFIGURE = x; then
+ echo "./configure $*"
+ ./configure $*
+fi