Put own includes at the startt of CPPFLAGS

Otherwise with --with-libevent=/usr wrong includes may be used.

Per report from Bjorn Munch

diff --git a/config.mak.in b/config.mak.in
index 9a2a6872f57693eeba7f698c1bb5fde9a639b232..e8e4fb020659f8b0fa77238562ab76b5f7eb7be2 100644 (file)
--- a/config.mak.in
+++ b/config.mak.in
@@ -5,7 +5,7 @@ DEFS = @DEFS@
 LIBS = @LIBS@
 CC = @CC@
 CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include
+CPPFLAGS = -I$(srcdir)/include @CPPFLAGS@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 

diff --git a/configure.ac b/configure.ac
index 33573a234947749dbe2411ec2e31331ad158a06a..bc96f747f000fd32a4fab99a8e8db95050f5dfb5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -186,7 +186,7 @@ else
 fi
 
 if test \! "$srcdir" = "$builddir"; then
-  CPPFLAGS="$CPPFLAGS -I\$(builddir)/include"
+  CPPFLAGS="-I\$(builddir)/include $CPPFLAGS"
 fi
 
 dnl Output findings