[Gaim-commits] CVS: gaim config.rpath,NONE,1.1 ChangeLog,1.519,1.520 Makefile.am,1.31,1.32 autogen.sh,1.14,1.15

[Christian H. <ch...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv30767

Modified Files:
	ChangeLog Makefile.am autogen.sh 
Added Files:
	config.rpath 
Log Message:
Here it is. Added gettext 0.11.x support! It should work fine, but please
let me know if anything is broken in 0.10.x or 0.11.x (in my tests, it
all worked fine)


--- NEW FILE: config.rpath ---

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.519
retrieving revision 1.520
diff -u -d -r1.519 -r1.520
--- ChangeLog	7 Aug 2002 23:25:33 -0000	1.519
+++ ChangeLog	8 Aug 2002 18:11:15 -0000	1.520
@@ -32,6 +32,7 @@
 	  Etan Reisner)
 	* TOC no longer compiles statically by default--use OSCAR
 	* ICQ plugin no longer gets built--use OSCAR
+	* Added support for gettext 0.11.x.
 
 version 0.59 (06/24/2002):
 	* Hungarian translation added (Thanks, Sutto Zoltan)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/Makefile.am,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Makefile.am	9 Dec 2001 13:18:58 -0000	1.31
+++ Makefile.am	8 Aug 2002 18:11:15 -0000	1.32
@@ -1,5 +1,5 @@
 
-EXTRA_DIST = gaim.spec.in gaim_applet.gnorba gaim.desktop gaim_applet.desktop \
+EXTRA_DIST = config.rpath gaim.spec.in gaim_applet.gnorba gaim.desktop gaim_applet.desktop \
 	HACKING gaim2blt.pl licq2gaim.pl
 
 if DISTRIB

Index: autogen.sh
===================================================================
RCS file: /cvsroot/gaim/gaim/autogen.sh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- autogen.sh	26 Apr 2002 00:59:30 -0000	1.14
+++ autogen.sh	8 Aug 2002 18:11:15 -0000	1.15
@@ -1,5 +1,15 @@
 #!/bin/sh
 
+abort() {
+	# Don't break the tree if something goes wrong.
+	if [ -e m4~ ]; then
+		rm -rf m4
+		mv m4~ m4
+	fi
+
+	exit 1
+}
+
 (gettextize --version) < /dev/null > /dev/null 2>&1 || {
 	echo;
 	echo "You must have gettext installed to compile Gaim";
@@ -42,7 +52,26 @@
 echo;
 
 echo "Running gettextize, please ignore non-fatal messages...."
-echo n | gettextize --copy --force || exit;
+
+# Get the major version of gettext.
+GETTEXT_VER=`gettextize --version | sed -n 's/^.*[0-9]\+\.\([0-9]\+\)\..*$/\1/p'`
+
+# Decide how we want to run gettext.
+if [ $GETTEXT_VER -eq 11 ]; then
+	mv -f m4 m4~
+
+	echo n | gettextize --copy --force --intl --no-changelog || abort
+
+	# Now restore the things that brain-dead gettext modified.
+	[ -e configure.in~ ] && mv -f configure.in~ configure.in
+	[ -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
 echo "Running libtoolize, please ignore non-fatal messages...."
 echo n | libtoolize --copy --force || exit;