fixed inclusion of intl headers,

using a hack that other packages do not appear to require, but well...

configure.ac

@@ -384,6 +384,7 @@ AM_CONDITIONAL([GNOME2], [test x$gnome = xyes && test x$gnome1found = xno])
 AM_CONDITIONAL([GCC], [test x$GXX = xyes])
 AM_CONDITIONAL([WZIP], [test x$wzip = xyes])
 AM_CONDITIONAL([X11], [false])
+AM_CONDITIONAL([INCLUDEDINTL], [test x$nls_cv_use_gnu_gettext = xyes])
 
 #######################################################################
 # Check for PNG support in SDL_image                                  #

src/Makefile.am

@@ -299,8 +299,11 @@ wesnoth_editor_SOURCES = editor/editor.cpp \
 			 widgets/slider.hpp \
 			 widgets/widget.hpp
 
-AM_CXXFLAGS = @SDL_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\" -DLOCALEDIR=\"$(localedir)\" \
-	-I$(srcdir)/../intl -I../intl
+AM_CXXFLAGS = @SDL_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\" -DLOCALEDIR=\"$(localedir)\"
+
+if INCLUDEDINTL
+AM_CXXFLAGS += -I../intl -I$(top_srcdir)/intl
+endif
 
 if X11
     CXXFLAGS += -D_X11 @X_CFLAGS@