[Gaim-commits] CVS: gaim autogen.sh,1.15,1.16

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

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

Modified Files:
	autogen.sh 
Log Message:
Okay, rant time. Anybody who has experienced this problem will appreciate
this.

Gettext 0.11.x is, as we all know, evil. People have been complaining
that, now that 0.11.x actually works, they're getting the following
message:

"Press Return to acknowledge the previous ___."

It had been assumed that the previous paragraphs were the reasons for the
pause. However, you always get at least one error. It's hard-coded in.
It's more of a "friendly reminder," really. On top of that, even if
there were no errors, the pause after the message is also hard-coded in
outside of any conditionals. You CANNOT get rid of it by "fixing" anything
in the tree. It's always there.

On top of that, take a look at these lines:

echo "Press Return to acknowledge the previous $count."
# Read from /dev/tty, not stdin, so that gettextize cannot be abused by
# non-interactive tools.
read < /dev/tty

See that? They specifically coded it so you cannot bypass it.

This commit bypasses it.

We're copying gettextize to gaim-gettextize and removing that read line,
running it, removing gaim-gettextize. Nasty hack, but it works.

You can all thank me when I wake up tomorrow. :)


Index: autogen.sh
===================================================================
RCS file: /cvsroot/gaim/gaim/autogen.sh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- autogen.sh	8 Aug 2002 18:11:15 -0000	1.15
+++ autogen.sh	18 Aug 2002 09:26:36 -0000	1.16
@@ -60,7 +60,12 @@
 if [ $GETTEXT_VER -eq 11 ]; then
 	mv -f m4 m4~
 
-	echo n | gettextize --copy --force --intl --no-changelog || abort
+	# 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