Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv18201
Modified Files:
autogen.sh
Log Message:
It'd be one thing if they used autopoint all throughout 0.11.x, but
0.11.0, 0.11.1, and 0.11.2 (maybe even .3!) don't include it! So,
back go the hacks, except now it's all much bigger because of the
existance of autopoint.
Index: autogen.sh
===================================================================
RCS file: /cvsroot/gaim/gaim/autogen.sh,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- autogen.sh 18 Aug 2002 18:21:08 -0000 1.20
+++ autogen.sh 19 Aug 2002 05:25:16 -0000 1.21
@@ -66,7 +66,30 @@
rm -rf m4
mv -f m4~ m4
else
- echo n | gettextize --copy --force || exit;
+ # They could have at least done us a favor and used autopoint all
+ # throughout 0.11.x.
+ GETTEXT_VER=`gettextize --version | sed -n 's/^.*[0-9]\+\.\([0-9]\+\)\..*$/\1/p'`
+ if [ $GETTEXT_VER -eq 11 ]; then
+ mv -f m4 m4~
+
+ # Gettext is pure evil. It DEMANDS that we press Return no matter
+ # what. This gets rid of their happy "feature" of doom.
+ sed 's:read .*< /dev/tty::' `which gettextize` > gaim-gettextize
+ chmod +x gaim-gettextize
+ echo n | ./gaim-gettextize --copy --force --intl --no-changelog || abort
+ rm gaim-gettextize
+
+ # Now restore the things that brain-dead gettext modified.
+ [ -e configure.in~ ] && mv -f configure.in~ configure.in
+ [ -e configure.ac~ ] && mv -f configure.ac~ configure.ac
+ [ -e Makefile.am~ ] && mv -f Makefile.am~ Makefile.am
+ rm -rf m4
+ mv -f m4~ m4
+
+ mv -f po/Makevars.template po/Makevars
+ else
+ echo n | gettextize --copy --force || exit;
+ fi
fi
echo "Running libtoolize, please ignore non-fatal messages...."
|
