MCONFIG.in:

  Rearrange -I options to give local includes precedence over
  /usr/local/include, to unbreak the build when an older
  e2fsprogs version (with includes) is installed under
  /usr/local (for instance, on FreeBSD).

diff --git a/MCONFIG.in b/MCONFIG.in
index 4da61a5..88aaf8a 100644 (file)
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -34,11 +34,10 @@ CC = @CC@
 BUILD_CC = @BUILD_CC@
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
+CPPFLAGS =  -I$(top_builddir)/lib -I$(top_srcdir)/lib @CPPFLAGS@
 INTL_FLAGS = @INTL_FLAGS@
 ALL_CFLAGS = $(CPPFLAGS) $(DEFS) $(USE_WFLAGS) $(CFLAGS) $(XTRA_CFLAGS) \
-       $(INTL_FLAGS) -I$(top_builddir)/lib -I$(top_srcdir)/lib \
-       $(LINUX_INCLUDE) 
+       $(INTL_FLAGS) $(LINUX_INCLUDE) 
 LDFLAGS = @LDFLAGS@
 ALL_LDFLAGS = $(LDFLAGS)
 RM = @RM@