[SCM] Samba Shared Repository - branch master updated

Jelmer Vernooij jelmer at samba.org
Fri Jan 1 10:33:26 MST 2010


The branch, master has been updated
       via  9085499... heimdal_build: Explicitly specify 'YES' when enabling external libraries.
       via  0c29640... s4/build: Indicate whether Samba4 is being built against the system Heimdal.
      from  de94857... s4-net: fixed finddcs to use empty SID instead of NULL sid (NDR error)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9085499bbb518bdfa91f9c02103ad058b0b06192
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Jan 1 18:32:37 2010 +0100

    heimdal_build: Explicitly specify 'YES' when enabling external
    libraries.

commit 0c2964035888c3af63f274078c75e195153c46be
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Jan 1 18:31:44 2010 +0100

    s4/build: Indicate whether Samba4 is being built against the system
    Heimdal.

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

Summary of changes:
 source4/build/smb_build/summary.pm |    1 +
 source4/heimdal_build/external.m4  |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/build/smb_build/summary.pm b/source4/build/smb_build/summary.pm
index 153c3e2..09f5ff8 100644
--- a/source4/build/smb_build/summary.pm
+++ b/source4/build/smb_build/summary.pm
@@ -65,6 +65,7 @@ sub show($$)
 	showisexternal($output, "tdb", "LIBTDB");
 	showisexternal($output, "tevent", "LIBTEVENT");
 	showisexternal($output, "ldb", "LIBLDB");
+	showisexternal($output, "heimdal", "HEIMDAL_KRB5");
 	print "Developer mode: ".(enabled($config->{developer})?"yes":"no")."\n";
 	print "Automatic dependencies: ".
 	    (enabled($config->{automatic_dependencies})
diff --git a/source4/heimdal_build/external.m4 b/source4/heimdal_build/external.m4
index 3cd8900..ad9443f 100644
--- a/source4/heimdal_build/external.m4
+++ b/source4/heimdal_build/external.m4
@@ -12,7 +12,7 @@ SMB_EXT_LIB(HEIMDAL_KRB5,
 	    [${HEIMDAL_KRB5_CFLAGS}],
 	    [${HEIMDAL_KRB5_CPPFLAGS}],
 	    [${HEIMDAL_KRB5_LDFLAGS}])
-SMB_ENABLE(HEIMDAL_KRB5)
+SMB_ENABLE(HEIMDAL_KRB5,YES)
 AC_DEFINE(HAVE_KRB5,1,[Whether kerberos is available])
 HAVE_KRB5=YES
 AC_DEFINE(HAVE_COM_ERR,1,[Whether com_err is available])
@@ -27,7 +27,7 @@ SMB_EXT_LIB(HEIMDAL_GSSAPI,
 	    [${HEIMDAL_GSSAPI_CFLAGS}],
 	    [${HEIMDAL_GSSAPI_CPPFLAGS}],
 	    [${HEIMDAL_GSSAPI_LDFLAGS}])
-SMB_ENABLE(HEIMDAL_GSSAPI)
+SMB_ENABLE(HEIMDAL_GSSAPI,YES)
 AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])
 HAVE_GSSAPI=YES
 
@@ -40,7 +40,7 @@ SMB_EXT_LIB(HEIMDAL_HDB,
 	    [${HEIMDAL_HDB_CFLAGS}],
 	    [${HEIMDAL_HDB_CPPFLAGS}],
 	    [${HEIMDAL_HDB_LDFLAGS}])
-SMB_ENABLE(HEIMDAL_HDB)
+SMB_ENABLE(HEIMDAL_HDB,YES)
 
 HEIMDAL_KDC_LIBS="-lkdc"
 HEIMDAL_KDC_CFLAGS=""
@@ -51,4 +51,4 @@ SMB_EXT_LIB(HEIMDAL_KDC,
 	    [${HEIMDAL_KDC_CFLAGS}],
 	    [${HEIMDAL_KDC_CPPFLAGS}],
 	    [${HEIMDAL_KDC_LDFLAGS}])
-SMB_ENABLE(HEIMDAL_KDC)
+SMB_ENABLE(HEIMDAL_KDC,YES)


-- 
Samba Shared Repository


More information about the samba-cvs mailing list