diff options
Diffstat (limited to 'source3/configure.in')
| -rw-r--r-- | source3/configure.in | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source3/configure.in b/source3/configure.in index f813e87fb7..c26e65f128 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -131,8 +131,6 @@ else CFLAGS="-O" fi -CFLAGS="${CFLAGS} -D_SAMBA_BUILD_=3" - m4_include(lib/socket_wrapper/config.m4) m4_include(lib/nss_wrapper/config.m4) @@ -6200,6 +6198,13 @@ MSG fi +esyscmd([test -d ../samba4]) +ifelse(sysval,0,[ +AC_SUBST(MERGED_BUILD) +MERGED_BUILD=1 +m4_include(samba4.m4) +],[]) + dnl Remove -L/usr/lib/? from LDFLAGS and LIBS LIB_REMOVE_USR_LIB(LDFLAGS) LIB_REMOVE_USR_LIB(LIBS) |