diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-15 18:03:45 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-15 18:03:45 +0200 |
| commit | 7979cae206cd1e1e352f32fba6165aa3b56f4add (patch) | |
| tree | b6d25f20786fbd47a0a98d81784988e5d9f30c11 /source3/configure.in | |
| parent | 47b26ef57c57cfe2b6c9acf90af785c0b2e73404 (diff) | |
| parent | 9c455879f02606127686cde50552af53ccff8cb8 (diff) | |
| download | samba-7979cae206cd1e1e352f32fba6165aa3b56f4add.tar.gz samba-7979cae206cd1e1e352f32fba6165aa3b56f4add.tar.bz2 samba-7979cae206cd1e1e352f32fba6165aa3b56f4add.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wmi
Diffstat (limited to 'source3/configure.in')
| -rw-r--r-- | source3/configure.in | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/source3/configure.in b/source3/configure.in index f813e87fb7..248c39ac4c 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,14 @@ MSG fi +AC_ARG_ENABLE(merged-build, +[AS_HELP_STRING([--enable-merged-build], [Build Samba 4 as well])]) + +if test x$enable_merged_build = xyes; then + MERGED_BUILD=1 + m4_include(samba4.m4) +fi + dnl Remove -L/usr/lib/? from LDFLAGS and LIBS LIB_REMOVE_USR_LIB(LDFLAGS) LIB_REMOVE_USR_LIB(LIBS) @@ -6248,6 +6254,10 @@ fi SMBD_LIBS="$samba_dmapi_libs" AC_SUBST(SMBD_LIBS) +if test x$MERGED_BUILD != x1; then + CFLAGS="${CFLAGS} \$(FLAGS) -D_SAMBA_BUILD_=3" +fi + AC_OUTPUT(Makefile script/findsmb smbadduser script/gen-8bit-gap.sh script/installbin.sh script/uninstallbin.sh lib/netapi/examples/Makefile |