[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-611-ge45edef

[Stefan Metzmacher]

The branch, v3-4-test has been updated
       via  e45edef8261f6c77de181cb896aa36987e5a36b4 (commit)
      from  a7bbe8d10835d813a8d528e6e70f5d944ac0f804 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit e45edef8261f6c77de181cb896aa36987e5a36b4
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Apr 1 15:29:25 2009 +0200

    Print an error if trying a merged build without a system kerberos lib
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit ffdc2a3fe8437582ded1c4a3b09a54201519889b)

-----------------------------------------------------------------------

Summary of changes:
 source3/configure.in |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 22bbe06..b4f6362 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3918,6 +3918,10 @@ if test x"$with_ads_support" != x"no"; then
 LIBS="$ac_save_LIBS"
 fi
 
+if test x"$use_ads" != xyes; then
+	merged_build_possible=no
+fi
+
 AC_CHECK_LIB_EXT(nscd, NSCD_LIBS, nscd_flush_cache)
 PASSDB_LIBS="$PASSDB_LIBS $NSCD_LIBS"
 
@@ -6355,6 +6359,11 @@ AC_ARG_ENABLE(merged-build,
 [AS_HELP_STRING([--enable-merged-build], [Build Samba 4 as well])], 
 [ enable_merged_build=$enableval ], [ enable_merged_build=auto ])
 
+if test x"$enable_merged_build" = x"yes" -a \
+	x"$merged_build_possible" = x"no" ; then
+	AC_MSG_ERROR(Merged build required but not possible)
+fi
+
 m4_include(../lib/zlib/zlib.m4)
 
 if test x$enable_merged_build = xauto; then


-- 
Samba Shared Repository