Replace PACKAGE with PKG_NAME, since PKG_NAME is what is defined by the

	* autogen.sh: Replace PACKAGE with PKG_NAME, since PKG_NAME is
	what is defined by the various applications' autogen.sh. Also,
	call autopoint rather than gettextize when appropriate (when
	AM_GNU_GETTEXT_VERSION is present).

svn path=/trunk/; revision=2781

diff --git a/macros2/ChangeLog b/macros2/ChangeLog
index de85225..f47c46c 100644 (file)
--- a/macros2/ChangeLog
+++ b/macros2/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-07  Malcolm Tredinnick <malcolm@commsecure.com.au>
+       
+       * autogen.sh: Replace PACKAGE with PKG_NAME, since PKG_NAME is
+       what is defined by the various applications' autogen.sh. Also,
+       call autopoint rather than gettextize when appropriate (when
+       AM_GNU_GETTEXT_VERSION is present).
+
 2003-02-27  Mark McLoughlin  <mark@skynet.ie>
 
        * compiler-flags.m4: fix mixed up order of arguments to

diff --git a/macros2/autogen.sh b/macros2/autogen.sh
index f1a0437..b19d539 100644 (file)
--- a/macros2/autogen.sh
+++ b/macros2/autogen.sh
@@ -2,7 +2,7 @@
 # Run this to generate all the initial makefiles, etc.
 
 #name of package
-PACKAGE=${PACKAGE:-Package}
+PKG_NAME=${PKG_NAME:-Package}
 srcdir=${srcdir:-.}
 
 # default version requirements ...
@@ -316,8 +316,13 @@ for configure_ac in $configure_files; do
            printbold "Running $GLIB_GETTEXTIZE... Ignore non-fatal messages."
            echo "no" | $GLIB_GETTEXTIZE --force --copy || exit 1
        elif grep "^AM_GNU_GETTEXT" $basename >/dev/null; then
-           printbold "Running $GETTEXTIZE... Ignore non-fatal messages."
-           echo "no" | $GETTEXTIZE --force --copy || exit 1
+          if grep "^AM_GNU_GETTEXT_VERSION" $basename > /dev/null; then
+               printbold "Running autopoint..."
+               autopoint --force || exit 1
+          else
+               printbold "Running $GETTEXTIZE... Ignore non-fatal messages."
+               echo "no" | $GETTEXTIZE --force --copy || exit 1
+          fi
        fi
        if grep "^AC_PROG_INTLTOOL" $basename >/dev/null; then
            printbold "Running $INTLTOOLIZE..."