From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 14 Mar 2009 22:01:57 +0000 (+0100)
Subject: Properly strip /usr/lib and /usr/include for the merged build.
X-Git-Tag: tdb-1.1.5~1088^2
X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=a3d2b77ddd9808b35300446cebca1b403ca56f78

Properly strip /usr/lib and /usr/include for the merged build.
---

diff --git a/source3/samba4.m4 b/source3/samba4.m4
index d11d3be2d50..3a8b05ff3c9 100644
--- 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"