changeset 3408:ba6d0856c8e4

[gaim-migrate @ 3427] This should work a little bit better for everyone. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Sun, 18 Aug 2002 18:21:08 +0000
parents 02a10c03e3e1
children 3543e82bb4af
files autogen.sh configure.ac configure.in
diffstat 3 files changed, 3 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/autogen.sh	Sun Aug 18 18:00:43 2002 +0000
+++ b/autogen.sh	Sun Aug 18 18:21:08 2002 +0000
@@ -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
--- a/configure.ac	Sun Aug 18 18:00:43 2002 +0000
+++ b/configure.ac	Sun Aug 18 18:21:08 2002 +0000
@@ -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
--- a/configure.in	Sun Aug 18 18:00:43 2002 +0000
+++ b/configure.in	Sun Aug 18 18:21:08 2002 +0000
@@ -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