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

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

diff --git a/source3/samba4.m4 b/source3/samba4.m4
index d11d3be2d50a371802dd0b31d4d14be79af4e97e..3a8b05ff3c93c1f50334f43308f6529a49d2c2fd 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 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"
 SMB_WRITE_MAKEVARS(samba4-config.mk, [prefix exec_prefix CPPFLAGS LDSHFLAGS POPT_OBJ CFLAGS TALLOC_OBJ POPT_LIBS srcdir builddir])
                 
 oldbuilddir="$builddir"