X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=autogen.sh;h=1209bd8e0045d7fb70f7eabdef1df0911dc9040d;hp=6375e6f88413872e8594a2777f4493a0d5e59147;hb=912e7e968f4888d62b3c620893a70e825599973b;hpb=62d5384ee01ae818906f2f8ba1456372a13a2420

diff --git a/autogen.sh b/autogen.sh
index 6375e6f8..1209bd8e 100644
--- 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
@@ -94,19 +99,23 @@ 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
 	else
 	  echo "Creating $dr/aclocal.m4 ..."
 	  test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-	  echo "Running gettextize...  Ignore non-fatal messages."
-	  echo "no" | gettextize --force --copy
+	  echo "Running autopoint..."
+	  autopoint --force
 	  echo "Making $dr/aclocal.m4 writable ..."
 	  test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
         fi
@@ -114,8 +123,8 @@ do
       if grep "^AM_GNOME_GETTEXT" configure.in >/dev/null; then
 	echo "Creating $dr/aclocal.m4 ..."
 	test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-	echo "Running gettextize...  Ignore non-fatal messages."
-	echo "no" | gettextize --force --copy
+	echo "Running autopoint..."
+	autopoint --force
 	echo "Making $dr/aclocal.m4 writable ..."
 	test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
       fi