Merge branch 'checktalloc' of /home/jelmer/samba4

[ira/wip.git] / source3 / samba4.m4

diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 97a1a3ba19f30b4fcfe0667e6defe46168c76310..cfb7c1c75e16d8b2a309111464e83d9ae7763862 100644 (file)
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -152,6 +152,14 @@ fi
 dnl Samba 4 files
 AC_SUBST(LD)
 AC_LIBREPLACE_SHLD_FLAGS
+dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
+LIB_REMOVE_USR_LIB(LDFLAGS)
+LIB_REMOVE_USR_LIB(LIBS)
+LIB_REMOVE_USR_LIB(KRB5_LIBS)
+
+dnl Remove -I/usr/include/? from CFLAGS and CPPFLAGS
+CFLAGS_REMOVE_USR_INCLUDE(CFLAGS)
+CFLAGS_REMOVE_USR_INCLUDE(CPPFLAGS)
 SMB_WRITE_MAKEVARS(samba4-config.mk, [prefix exec_prefix CPPFLAGS LDSHFLAGS POPT_OBJ CFLAGS TALLOC_OBJ POPT_LIBS srcdir builddir])
                 
 oldbuilddir="$builddir"