Strip /usr/include from include flags, so we don't end up including

the system tevent if it's too old.

diff --git a/lib/util/fault.m4 b/lib/util/fault.m4
index bac553a1583c3dd63522ee2a7658766073f61240..c22976998ed55b3a893c8c40ed3c34d786cfcea9 100644 (file)
--- a/lib/util/fault.m4
+++ b/lib/util/fault.m4
@@ -9,6 +9,8 @@ if test x"$ac_cv_header_execinfo_h" = x"yes" -a x"$ac_cv_func_ext_backtrace" = x
        EXECINFO_CPPFLAGS="$CPPFLAGS"
        EXECINFO_LDFLAGS="$LDFLAGS"
        LIB_REMOVE_USR_LIB(EXECINFO_LDFLAGS)
+       CFLAGS_REMOVE_USR_INCLUDE(EXECINFO_CFLAGS)
+       CFLAGS_REMOVE_USR_INCLUDE(EXECINFO_CPPFLAGS)
 else
        SMB_ENABLE(EXECINFO,NO)
 fi

diff --git a/source4/auth/config.m4 b/source4/auth/config.m4
index fb9ee58c60faeef47b527fb2b4374c826150deb4..9735b17caca07a0190edea5134f00aba736de7db 100644 (file)
--- a/source4/auth/config.m4
+++ b/source4/auth/config.m4
@@ -28,6 +28,8 @@ if test x"$ac_cv_header_sasl_sasl_h" = x"yes" -a x"$ac_cv_lib_ext_sasl2_sasl_cli
        SASL_CPPFLAGS="$CPPFLAGS"
        SASL_LDFLAGS="$LDFLAGS"
        LIB_REMOVE_USR_LIB(SASL_LDFLAGS)
+       CFLAGS_REMOVE_USR_INCLUDE(SASL_CPPFLAGS)
+       CFLAGS_REMOVE_USR_INCLUDE(SASL_CFLAGS)
 else
        SMB_ENABLE(cyrus_sasl,NO)
 fi

diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index 6860e56e7fc1f41c5f9046780aee9f6f450136c2..732de1e20e0942afc6974e4f2745cab809cd3023 100644 (file)
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -101,10 +101,12 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG],
 
                                ac_cv_$1_libs_only_other="`$PKG_CONFIG --libs-only-other '$2'` `$PKG_CONFIG --libs-only-L '$2'`"
                                LIB_REMOVE_USR_LIB(ac_cv_$1_libs_only_other)
+                               ac_cv_$1_includedir_only="`$PKG_CONFIG --cflags-only-I '$2'`"
+                               CFLAGS_REMOVE_USR_INCLUDE(ac_cv_$1_includedir_only)
                                SMB_EXT_LIB($1, 
                                        [`$PKG_CONFIG --libs-only-l '$2'`], 
                                        [`$PKG_CONFIG --cflags-only-other '$2'`],
-                                       [`$PKG_CONFIG --cflags-only-I '$2'`],
+                                       [$ac_cv_$1_includedir_only],
                                        [$ac_cv_$1_libs_only_other])
                                ac_cv_$1_found=yes