diff --git a/autogen.sh b/autogen.sh
index 20ea5ed34badcefd3a4e26102c73f046d5e11aa5..1ab5e4cdff656c8b65e79429f78a6a2ee98005f2 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
-#! /bin/sh
+#!/bin/sh -e
# Generate config.h.in
-echo "autoheader..."
-autoheader
-
echo "touch stamp-h"
touch stamp-h
-# rerun libtoolize
-echo "libtoolize..."
-libtoolize --force
-
# add aclocal.m4 to current dir
echo "aclocal..."
-aclocal
+aclocal -I $PWD/m4
# This generates the configure script from configure.in
echo "autoconf..."
autoconf
+echo "autoheader..."
+autoheader
+
# Generate Makefile.in from Makefile.am
echo "automake..."
-automake
+automake --add-missing
+
# configure
-echo "./configure $*"
-./configure $*
+if test x$NOCONFIGURE = x; then
+ echo "./configure $*"
+ ./configure $*
+fi