[Gaim-commits] CVS: gaim autogen.sh,1.29,1.30 setup-gettext,1.11,NONE

[Richard L. <rl...@us...>]

Update of /cvsroot/gaim/gaim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13304

Modified Files:
	autogen.sh 
Removed Files:
	setup-gettext 
Log Message:
Finish the switch to glib-gettext.

Index: autogen.sh
===================================================================
RCS file: /cvsroot/gaim/gaim/autogen.sh,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -p -r1.29 -r1.30
--- autogen.sh	8 Feb 2006 07:44:22 -0000	1.29
+++ autogen.sh	8 Feb 2006 21:01:56 -0000	1.30
@@ -1,10 +1,8 @@
 #!/bin/sh
 
-SETUP_GETTEXT=./setup-gettext
-
-($SETUP_GETTEXT --gettext-tool) < /dev/null > /dev/null 2>&1 || {
+(intltoolize --version) < /dev/null > /dev/null 2>&1 || {
 	echo;
-	echo "You must have gettext installed to compile Gaim";
+	echo "You must have intltool installed to compile Gaim";
 	echo;
 	exit;
 }
@@ -33,17 +31,6 @@ SETUP_GETTEXT=./setup-gettext
 echo "Generating configuration files for Gaim, please wait...."
 echo;
 
-# Backup the po/ChangeLog. This should prevent the annoying
-# gettext ChangeLog modifications.
-
-cp -p po/ChangeLog po/ChangeLog.save
-
-echo "Running gettextize, please ignore non-fatal messages...."
-$SETUP_GETTEXT
-
-# Restore the po/ChangeLog file.
-mv po/ChangeLog.save po/ChangeLog
-
 echo "Running libtoolize, please ignore non-fatal messages...."
 echo n | libtoolize --copy --force || exit;
 

--- setup-gettext DELETED ---