Remove config.{status,cache} before running configure

[tinc] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 55a27a9..09e5a70 100644 (file)
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,12 @@
 
 DIE=0
 
-srcdir="`pwd`"
+if ${MAKE:-gmake} -q -C . autogen.sh 2> /dev/null
+then
+  alias make=${MAKE:-gmake}
+fi
+
+srcdir="`/bin/pwd`"
 
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
   echo
@@ -102,6 +107,7 @@ do
        ##  echo "**Warning**: No such directory \`$k'.  Ignored."
         fi
       done
+      touch ChangeLog
       if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then
        if grep "sed.*POTFILES" configure.in >/dev/null; then
          : do nothing -- we still have an old unmodified configure.in
@@ -144,6 +150,7 @@ conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
 
 if test x$NOCONFIGURE = x; then
   echo Running $srcdir/configure $conf_flags "$@" ...
+  rm -f config.status config.cache
   $srcdir/configure $conf_flags "$@" \
   && echo Now type \`make\' to compile $PKG_NAME || exit 1
 else