The branch, master has been updated via 6660ac5d0ab882e1fd70a72af96b1b1e815b4b14 (commit) from 7d5fb989ac9942a6f3394853f6930d34ef6adf7b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 6660ac5d0ab882e1fd70a72af96b1b1e815b4b14 Author: Volker Lendecke <[EMAIL PROTECTED]> Date: Tue Sep 23 01:24:56 2008 +0200 Fix make pch in the merged build ----------------------------------------------------------------------- Summary of changes: source3/configure.in | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/configure.in b/source3/configure.in index d1000d9..f23f6b5 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 -- Samba Shared Repository