Gettext 1.11.5 compatibility.

[tinc] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index c0083be..1209bd8 100644 (file)
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,10 @@
 
 DIE=0
 
-alias make=${MAKE:-make}
+if ${MAKE:-gmake} -q -C . autogen.sh 2> /dev/null
+then
+  alias make=${MAKE:-gmake}
+fi
 
 srcdir="`/bin/pwd`"
 
@@ -111,8 +114,8 @@ do
        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
@@ -120,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