[Gaim-commits] CVS: gaim autogen.sh,1.19,1.20 configure.ac,1.75,1.76 configure.in,1.123,1.124

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

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

Modified Files:
	autogen.sh configure.ac configure.in 
Log Message:
This should work a little bit better for everyone.


Index: autogen.sh
===================================================================
RCS file: /cvsroot/gaim/gaim/autogen.sh,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- autogen.sh	18 Aug 2002 18:00:43 -0000	1.19
+++ autogen.sh	18 Aug 2002 18:21:08 -0000	1.20
@@ -62,16 +62,9 @@
 
 if [ $USE_AUTOPOINT -eq 1 ]; then
 	mv -f m4 m4~
-
-	echo n | autopoint --force || exit;
-
- 	# 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
+	echo n | autopoint --force || abort;
 	rm -rf m4
 	mv -f m4~ m4
-	mv -f po/Makevars.template po/Makevars
 else
 	echo n | gettextize --copy --force || exit;
 fi

Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- configure.ac	11 Aug 2002 06:42:16 -0000	1.75
+++ configure.ac	18 Aug 2002 18:21:08 -0000	1.76
@@ -16,6 +16,7 @@
 
 
 ALL_LINGUAS="bg cs da de es fi fr hu it ja ko nl pl ru sk sv zh_CN zh_TW"
+AM_GNU_GETTEXT_VERSION(0.10.40)
 AM_GNU_GETTEXT
 
 AC_CYGWIN

Index: configure.in
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.in,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- configure.in	15 Aug 2002 04:04:23 -0000	1.123
+++ configure.in	18 Aug 2002 18:21:08 -0000	1.124
@@ -16,6 +16,7 @@
 
 
 ALL_LINGUAS="bg cs da de es fi fr hu it ja ko nl pl ru sk sv zh_CN zh_TW"
+AM_GNU_GETTEXT_VERSION(0.10.40)
 AM_GNU_GETTEXT
 
 AC_CYGWIN