summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-03-14 23:02:34 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-03-14 23:02:34 +0100
commitd56524ac0486d691729bb5af851db302e4067b6c (patch)
tree54e84f2731a97de1ba228318358f7ae1fb3dbc4f /source3
parent56ad85c0eafa17ad5c7988b6207584cbda6db0a2 (diff)
parenta3d2b77ddd9808b35300446cebca1b403ca56f78 (diff)
downloadsamba-d56524ac0486d691729bb5af851db302e4067b6c.tar.gz
samba-d56524ac0486d691729bb5af851db302e4067b6c.tar.bz2
samba-d56524ac0486d691729bb5af851db302e4067b6c.zip
Merge branch 'checktalloc' into tdr
Diffstat (limited to 'source3')
-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"