Make sure setlocale() is available.

[tinc] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 9e3c045..1209bd8 100644 (file)
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,6 +4,11 @@
 
 DIE=0
 
+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 || {
@@ -70,9 +75,6 @@ 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"
@@ -112,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
@@ -121,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