X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=autogen.sh;h=9e3c04523f94134ab5bdb59b4df01b34b0f80efd;hp=6375e6f88413872e8594a2777f4493a0d5e59147;hb=9175d2048382c617a639fd3d437a9e06baa66d0f;hpb=62d5384ee01ae818906f2f8ba1456372a13a2420

diff --git a/autogen.sh b/autogen.sh
index 6375e6f8..9e3c0452 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@
 
 DIE=0
 
-srcdir="`pwd`"
+srcdir="`/bin/pwd`"
 
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
   echo
@@ -70,6 +70,9 @@ if test "$DIE" -eq 1; then
   exit 1
 fi
 
+# Make sure configure doesn't complain about old configuration
+rm -f config.status
+
 if test -z "$*"; then
   echo "**Warning**: I am going to run \`configure' with no arguments."
   echo "If you wish to pass any to it, please specify them on the"
@@ -94,11 +97,15 @@ do
       aclocalinclude="$ACLOCAL_FLAGS"
       for k in $macrodirs; do
   	if test -d $k; then
+	  if test -f $k/Makefile.am.in; then
+	    make -C $k -f Makefile.am.in Makefile.am
+	  fi
           aclocalinclude="$aclocalinclude -I $k"
   	##else 
 	##  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