--- Makefile.in.orig	2008-10-11 08:04:37.000000000 +0200
+++ Makefile.in	2008-10-11 08:06:06.000000000 +0200
@@ -724,7 +724,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
 ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4
-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
+SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man tests gnulib-tests examples
 
 # Allow users to use "gnulib-tool --update".
 
--- configure.orig	2008-10-11 08:14:23.000000000 +0200
+++ configure	2008-10-11 08:14:52.000000000 +0200
@@ -30510,10 +30510,6 @@ echo "${ECHO_T}$ac_res" >&6; }
 
       if test "$nls_cv_use_gnu_gettext" = "yes"; then
                 BUILD_INCLUDED_LIBINTL=yes
-        USE_INCLUDED_LIBINTL=yes
-        LIBINTL="\${top_builddir}/intl/libintl.la $LIBICONV $LIBTHREAD"
-        LTLIBINTL="\${top_builddir}/intl/libintl.la $LTLIBICONV $LTLIBTHREAD"
-        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       fi
 
       CATOBJEXT=