diff options
| author | Darin Adler <darin@src.gnome.org> | 2001-08-04 19:34:08 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2001-08-04 19:34:08 +0000 |
| commit | 77674e63a48f51e40b9975c21ac0a1107b4b2a97 (patch) | |
| tree | 8171efc4c86d8c7075f03ce965c8161c1d9245a5 | |
| parent | 49cce413c7eb5507ae706b796836f16bb456709d (diff) | |
| download | gnome-common-77674e63a48f51e40b9975c21ac0a1107b4b2a97.tar.gz | |
Update gettext logic to allow anything that starts with AM and ends with
* autogen.sh: Update gettext logic to allow anything that
starts with AM and ends with gettext. This makes it work with
AM_GLIB_GNU_GETTEXT, which is what libbonobo is now using.
svn path=/trunk/; revision=1939
| -rw-r--r-- | macros2/ChangeLog | 6 | ||||
| -rw-r--r-- | macros2/autogen.sh | 23 |
2 files changed, 8 insertions, 21 deletions
diff --git a/macros2/ChangeLog b/macros2/ChangeLog index eddf4f1..d0d1402 100644 --- a/macros2/ChangeLog +++ b/macros2/ChangeLog @@ -1,3 +1,9 @@ +2001-08-04 Darin Adler <darin@bentspoon.com> + + * autogen.sh: Update gettext logic to allow anything that + starts with AM and ends with gettext. This makes it work with + AM_GLIB_GNU_GETTEXT, which is what libbonobo is now using. + 2001-08-03 Martin Baulig <baulig@suse.de> * gnome-pkgconfig.m4 (GNOME_PKGCONFIG_CHECK_VERSION): Removed. diff --git a/macros2/autogen.sh b/macros2/autogen.sh index 1f9575c..4bdb49c 100644 --- a/macros2/autogen.sh +++ b/macros2/autogen.sh @@ -39,18 +39,7 @@ fi } } -grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && { - grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \ - (gettext --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`gettext' installed to compile $PKG_NAME." - echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 - } -} - -grep "^AM_GNOME2?_GETTEXT" $srcdir/configure.in >/dev/null && { +grep "^AM_[A-Z0-9_]\+_GETTEXT" $srcdir/configure.in >/dev/null && { grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \ (gettext --version) < /dev/null > /dev/null 2>&1 || { echo @@ -107,7 +96,7 @@ do ( cd $dr aclocalinclude="$ACLOCAL_FLAGS" - if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then + if grep "^AM_[A-Z0-9_]\+_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 @@ -119,14 +108,6 @@ do test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 fi fi - if grep "^AM_GNOME2_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 "Making $dr/aclocal.m4 writable ..." - test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 - fi if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then echo "Running xml-i18n-toolize... Ignore non-fatal messages." xml-i18n-toolize --copy --force --automake |