From 7842363032dd621ce3485a0059da7ddab20d36da Mon Sep 17 00:00:00 2001 From: Darin Adler Date: Tue, 2 Oct 2001 19:20:02 +0000 Subject: Complete intltool support. * autogen.sh: Complete intltool support. svn path=/trunk/; revision=2013 --- macros/ChangeLog | 4 ++++ macros/autogen.sh | 8 ++++++-- macros2/ChangeLog | 4 ++++ macros2/autogen.sh | 6 +++++- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/macros/ChangeLog b/macros/ChangeLog index 84a4bd28..47ee6107 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,7 @@ +2001-10-02 Darin Adler + + * autogen.sh: Complete intltool support. + 2001-10-02 Darin Adler * autogen.sh: Add intltool support. diff --git a/macros/autogen.sh b/macros/autogen.sh index ebc4768a..71f7dfcf 100644 --- a/macros/autogen.sh +++ b/macros/autogen.sh @@ -17,7 +17,7 @@ fi DIE=1 } -(grep "^AM_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && { +(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && { (intltoolize --version) < /dev/null > /dev/null 2>&1 || { echo echo "**Error**: You must have \`intltoolize' installed to compile $PKG_NAME." @@ -158,8 +158,12 @@ do echo "Making $dr/aclocal.m4 writable ..." test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 fi + if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then + echo "Running intltoolize..." + intltoolize --copy --force --automake + fi if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then - echo "Running xml-i18n-toolize... Ignore non-fatal messages." + echo "Running xml-i18n-toolize..." xml-i18n-toolize --copy --force --automake fi if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then diff --git a/macros2/ChangeLog b/macros2/ChangeLog index 6dae5a81..73ab6035 100644 --- a/macros2/ChangeLog +++ b/macros2/ChangeLog @@ -1,3 +1,7 @@ +2001-10-02 Darin Adler + + * autogen.sh: Complete intltool support. + 2001-10-02 Darin Adler * autogen.sh: Add intltool support. diff --git a/macros2/autogen.sh b/macros2/autogen.sh index 6a14054f..0d9d3bf4 100644 --- a/macros2/autogen.sh +++ b/macros2/autogen.sh @@ -19,7 +19,7 @@ fi DIE=1 } -(grep "^AM_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && { +(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && { (intltoolize --version) < /dev/null > /dev/null 2>&1 || { echo echo "**Error**: You must have \`intltoolize' installed to compile $PKG_NAME." @@ -118,6 +118,10 @@ do test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 fi fi + if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then + echo "Running intltoolize..." + intltoolize --copy --force --automake + fi if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then echo "Running xml-i18n-toolize..." xml-i18n-toolize --copy --force --automake -- cgit v1.2.1