--- gettext.m4.old	2006-01-02 19:33:06.000000000 +0100
+++ gettext.m4	2006-01-02 19:44:58.000000000 +0100
@@ -234,9 +234,11 @@
         dnl Mark actions used to generate GNU NLS library.
         BUILD_INCLUDED_LIBINTL=yes
         USE_INCLUDED_LIBINTL=yes
-        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
-        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
+        INTLDIR="ifelse([$3],[],\${top_builddir}/intl,[$3])"
+        LIBINTL="${INTLDIR}/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
+        LTLIBINTL="${INTLDIR}/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
         LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+        CPPFLAGS="$CPPFLAGS -I${INTLDIR}"
       fi
 
       CATOBJEXT=