diff -ur gettext-0.14.1.orig/gettext-tools/lib/gettext.h gettext-0.14.1/gettext-tools/lib/gettext.h
--- gettext-0.14.1.orig/gettext-tools/lib/gettext.h	2002-05-10 13:20:06.000000000 +0200
+++ gettext-0.14.1/gettext-tools/lib/gettext.h	2004-11-23 14:21:48.000000000 +0100
@@ -37,6 +37,26 @@
 # include <locale.h>
 #endif
 
+/* Linux g++ may include <libintl.h>, which will choke if gettext etc.
+   are defined as macros.  So we include it now to make later inclusions
+   of <libintl.h> a NOP.  We then undefine all macros defined below.  */
+/* FIXME:
+   The test "if defined(__linux)" should be replaced by something better.
+   */
+# if defined(__linux)
+#  include <libintl.h>
+# endif
+
+# undef gettext
+# undef dgettext
+# undef dcgettext
+# undef ngettext
+# undef dngettext
+# undef dcngettext
+# undef textdomain
+# undef bindtextdomain
+# undef bind_textdomain_codeset
+
 /* Disabled NLS.
    The casts to 'const char *' serve the purpose of producing warnings
    for invalid uses of the value returned from these functions.