[gaim-migrate @ 3433]

This is easier to maintain, cleaner, and you can take the script with you.

1 files changed, 7 insertions, 53 deletions

diff --git a/autogen.sh b/autogen.sh
index 4d782b9e58..6557f2de12 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,27 +1,12 @@
 #!/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
-}
-
-USE_AUTOPOINT=1
+SETUP_GETTEXT=./setup-gettext
 
-(autopoint --version) < /dev/null > /dev/null 2>&1 || {
-
-	USE_AUTOPOINT=0
-
-	(gettextize --version) < /dev/null > /dev/null 2>&1 || {
-		echo;
-		echo "You must have gettext installed to compile Gaim";
-		echo;
-		exit;
-	}
+($SETUP_GETTEXT --gettext-tool) < /dev/null > /dev/null 2>&1 || {
+	echo;
+	echo "You must have gettext installed to compile Gaim";
+	echo;
+	exit;
 }
 
 (libtoolize --version) < /dev/null > /dev/null 2>&1 || {
@@ -59,38 +44,7 @@ echo "Generating configuration files for Gaim, please wait...."
 echo;
 
 echo "Running gettextize, please ignore non-fatal messages...."
-
-if [ $USE_AUTOPOINT -eq 1 ]; then
-	mv -f m4 m4~
-	echo n | autopoint --force || abort;
-	rm -rf m4
-	mv -f m4~ m4
-else
-	# 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
+$SETUP_GETTEXT
 
 echo "Running libtoolize, please ignore non-fatal messages...."
 echo n | libtoolize --copy --force || exit;