Gettext produce libintl.h or libgnuintl.h depending the situation.

So patch libgnuintl.h.in so both header got the patch.
For win32 it seems to produce libintl.h so kludge this one.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index d221d3fca40e7ee23a68419062ec9ab1a0e1fdfc..41942e0862c7ef4bbb845d9a9ea8169791f480af 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -379,7 +379,7 @@ else
 endif
 # Work around another non-sense of autoconf.
 ifdef HAVE_WIN32
-       (cd ../include; sed -i.orig '311 c #if !1' libgnuintl.h)
+       (cd ../include; sed -i.orig '311 c #if 0' libintl.h)
 endif
        $(INSTALL_NAME)
        touch $@

diff --git a/extras/contrib/src/Patches/libintl.patch b/extras/contrib/src/Patches/libintl.patch
index e7b16d43fe310fe8f1e202433f28fde7a5d0672f..8ea266752740e92e432273bdc4ce331e5e3a10ff 100644 (file)
--- a/extras/contrib/src/Patches/libintl.patch
+++ b/extras/contrib/src/Patches/libintl.patch
@@ -1,5 +1,5 @@
---- gettext/gettext-runtime/intl/libgnuintl.h  2006-12-03 17:42:40.265625000 -0500
-+++ gettext/gettext-runtime/intl/libgnuintl.h  2006-12-04 19:27:03.125000000 -0500
+--- gettext/gettext-runtime/intl/libgnuintl.h.in       2006-12-03 17:42:40.265625000 -0500
++++ gettext/gettext-runtime/intl/libgnuintl.h.in       2006-12-04 19:27:03.125000000 -0500
 @@ -88,7 +88,7 @@
     If he doesn't, we choose the method.  A third possible method is
     _INTL_REDIRECT_ASM, supported only by GCC.  */