summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-09-23 01:24:56 +0200
committerVolker Lendecke <vl@samba.org>2008-09-23 01:44:41 +0200
commit6660ac5d0ab882e1fd70a72af96b1b1e815b4b14 (patch)
tree212562e496b29cbfff5816fc2f4b80c2b6832b1c
parent7d5fb989ac9942a6f3394853f6930d34ef6adf7b (diff)
downloadsamba-6660ac5d0ab882e1fd70a72af96b1b1e815b4b14.tar.gz
samba-6660ac5d0ab882e1fd70a72af96b1b1e815b4b14.tar.bz2
samba-6660ac5d0ab882e1fd70a72af96b1b1e815b4b14.zip
Fix make pch in the merged build
-rw-r--r--source3/configure.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/configure.in b/source3/configure.in
index d1000d9a52..f23f6b55be 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6272,8 +6272,10 @@ fi
SMBD_LIBS="$samba_dmapi_libs"
AC_SUBST(SMBD_LIBS)
+CFLAGS="${CFLAGS} \$(FLAGS)"
+
if test x$MERGED_BUILD != x1; then
- CFLAGS="${CFLAGS} \$(FLAGS) -D_SAMBA_BUILD_=3"
+ CFLAGS="${CFLAGS} -D_SAMBA_BUILD_=3"
fi
AC_OUTPUT(Makefile