summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-03-14 23:01:57 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-03-14 23:01:57 +0100
commita3d2b77ddd9808b35300446cebca1b403ca56f78 (patch)
treebc99d5a866834b389b487713fd8df7c4ec26e1f2
parent4ceaec6725509dac4a5c71421dabea1da96b70ab (diff)
downloadsamba-a3d2b77ddd9808b35300446cebca1b403ca56f78.tar.gz
samba-a3d2b77ddd9808b35300446cebca1b403ca56f78.tar.bz2
samba-a3d2b77ddd9808b35300446cebca1b403ca56f78.zip
Properly strip /usr/lib and /usr/include for the merged build.
-rw-r--r--source3/samba4.m48
1 files changed, 8 insertions, 0 deletions
diff --git a/source3/samba4.m4 b/source3/samba4.m4
index d11d3be2d5..3a8b05ff3c 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"