MCONFIG.in, configure.in: Only put the intl directory in the -I

	search path if we are using --with-internal-gettext.
	Otherwise causes compatibility problems with the woody
	glibc.   (Addresses Debian bug #193372)

diff --git a/ChangeLog b/ChangeLog
index 33df15d..a9c97c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-17  Theodore Tso  <tytso@thunk.org>
+
+       * MCONFIG.in, configure.in: Only put the intl directory in the -I
+               search path if we are using --with-internal-gettext.
+               Otherwise causes compatibility problems with the woody
+               glibc.   (Addresses Debian bug #193372)
+
 2003-05-13  Theodore Ts'o  <tytso@mit.edu>
 
        * configure.in: Fix typo in help message for --enable-evms-11

diff --git a/MCONFIG.in b/MCONFIG.in
index 21dd06b..59dde87 100644 (file)
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -37,9 +37,10 @@ BUILD_CC = @BUILD_CC@
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
+INTL_FLAGS = @INTL_FLAGS@
 ALL_CFLAGS = $(CPPFLAGS) $(DEFS) $(USE_WFLAGS) $(CFLAGS) $(XTRA_CFLAGS) \
-       -I$(top_builddir)/intl -I$(top_srcdir)/intl \
-       -I$(top_builddir)/lib -I$(top_srcdir)/lib $(LINUX_INCLUDE) 
+       $(INTL_FLAGS) -I$(top_builddir)/lib -I$(top_srcdir)/lib \
+       $(LINUX_INCLUDE) 
 LDFLAGS = @LDFLAGS@
 ALL_LDFLAGS = $(LDFLAGS)
 RM = @RM@

diff --git a/configure b/configure
index 1d1e8b6..ce1bf5e 100644 (file)
--- a/configure
+++ b/configure
@@ -6145,6 +6145,11 @@ else
   DO_TEST_SUITE=check
 fi
 
+INTL_FLAGS=
+if test "$USE_INCLUDED_LIBINTL" = "yes" ; then
+       INTL_FLAGS='-I$(top_builddir)/intl -I$(top_srcdir)/intl'
+fi
+
 test -d lib || mkdir lib
 test -d include || mkdir include
 test -d include/linux || mkdir include/linux
@@ -6419,6 +6424,7 @@ s%@LDFLAG_STATIC@%$LDFLAG_STATIC%g
 s%@SS_DIR@%$SS_DIR%g
 s%@ET_DIR@%$ET_DIR%g
 s%@DO_TEST_SUITE@%$DO_TEST_SUITE%g
+s%@INTL_FLAGS@%$INTL_FLAGS%g
 
 CEOF
 EOF

diff --git a/configure.in b/configure.in
index 9c5930a..509d491 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -827,6 +827,14 @@ else
 fi
 AC_SUBST(DO_TEST_SUITE)
 dnl
+dnl Only include the intl include files if we're building with them
+dnl 
+INTL_FLAGS=
+if test "$USE_INCLUDED_LIBINTL" = "yes" ; then
+       INTL_FLAGS='-I$(top_builddir)/intl -I$(top_srcdir)/intl'
+fi
+AC_SUBST(INTL_FLAGS)
+dnl
 dnl Make our output files, being sure that we create the some miscellaneous 
 dnl directories
 dnl