diff options
| author | Naba Kumar <naba@src.gnome.org> | 2002-10-22 06:30:56 +0000 |
|---|---|---|
| committer | Naba Kumar <naba@src.gnome.org> | 2002-10-22 06:30:56 +0000 |
| commit | 6fe63a3f9984d79bfed6d0f1cdd0f797a66742f4 (patch) | |
| tree | 8e8423f73fca2e0014bfdef60984ec3fc7cbaeeb | |
| parent | c82321d14041c3dc2ce3c3992b4dfdab920b2de6 (diff) | |
| download | shared-mime-info-6fe63a3f9984d79bfed6d0f1cdd0f797a66742f4.tar.gz | |
Patch from Biswapesh Chattopadhyay <biswapesh_chatterjee@tcscal.co.in>
* setup-gettext: New script to maintain gettext cross
version compatibility.
* configure.in, macros/autogen.sh: Fix for gettext
cross version compatibility.
svn path=/branches/ANJUTA_1_0_0/; revision=2630
| -rw-r--r-- | macros/autogen.sh | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/macros/autogen.sh b/macros/autogen.sh index 9e72eaa9..101491f7 100644 --- a/macros/autogen.sh +++ b/macros/autogen.sh @@ -47,14 +47,6 @@ fi } } -# Make sure we are using the correct gettext version -REQ_GETTEXT_VERSION=10 -GETTEXT_VERSION=`gettext --version | head -1 | awk -F\. '{print $(NF-1)}'` -if [ "$GETTEXT_VERSION" != "$REQ_GETTEXT_VERSION" ]; then - echo "You need to install GNU Gettext 0.$REQ_GETTEXT_VERSION.x (You currently have 0.$GETTEXT_VERSION.x)" - DIE=1 -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 || { @@ -153,7 +145,7 @@ do 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 + ./setup-gettext echo "Making $dr/aclocal.m4 writable ..." test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 fi @@ -162,7 +154,7 @@ do 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 + ./setup-gettext echo "Making $dr/aclocal.m4 writable ..." test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 fi |