[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-618-g2dfe952

[James Peach]

The branch, v3-2-test has been updated
       via  2dfe9525b9e6e7dcbac191c1fb6288e166d171e5 (commit)
      from  b215fb1ad0d5bb3fa7084c2773845ce1dffb2173 (commit)

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


- Log -----------------------------------------------------------------
commit 2dfe9525b9e6e7dcbac191c1fb6288e166d171e5
Author: James Peach <jpeach at samba.org>
Date:   Fri Oct 12 22:16:22 2007 -0700

    Autoconf support for detecting DNS Service Discovery support.
    
    Patch from Rishi Srivatsavai <rishisv at gmail.com>, with some
    adaptations.

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

Summary of changes:
 source/Makefile.in  |    1 +
 source/configure.in |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index 285255e..d26f688 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -63,6 +63,7 @@ KRB5LIBS=@KRB5_LIBS@
 LDAP_LIBS=@LDAP_LIBS@
 NSCD_LIBS=@NSCD_LIBS@
 UUID_LIBS=@UUID_LIBS@
+DNSSD_LIBS=@DNSSD_LIBS@
 
 INSTALLCMD=@INSTALL@
 INSTALLLIBCMD_SH=@INSTALLLIBCMD_SH@
diff --git a/source/configure.in b/source/configure.in
index 4c72ad3..06a6a45 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -6162,6 +6162,40 @@ AC_SUBST(POPTLIBS)
 AC_SUBST(FLAGS1)
 
 #################################################
+# Check if user wants DNS service discovery support
+
+AC_ARG_ENABLE(dnssd,
+[  --enable-dnssd          Enable DNS service discovery support (default=auto)])
+
+if test x"$enable_dnssd" != x"no"; then
+    have_dnssd_support=yes
+
+    AC_CHECK_HEADERS(dns_sd.h)
+    if test x"$ac_cv_header_dns_sd_h" != x"yes"; then
+	have_dnssd_support=no
+    fi
+
+    # On Darwin the DNSSD API is in libc, but on other platforms it's
+    # probably in -ldns_sd
+    AC_CHECK_FUNCS(DNSServiceRegister)
+    AC_CHECK_LIB_EXT(dns_sd, DNSSD_LIBS, DNSServiceRegister)
+    if test x"$ac_cv_func_DNSServiceRegister" != x"yes" -a \
+            x"$ac_cv_lib_ext_DNSServiceRegister" != x"yes"; then
+	have_dnssd_support=no
+    fi
+
+    if test x"$have_dnssd_support" = x"yes"; then
+	AC_DEFINE(WTH_DNSSD_SUPPORT, 1,
+		[Whether to enable DNS service discovery support])
+    else
+    	if test x"$enable_dnssd" = x"yes"; then
+	    AC_MSG_ERROR(DNS service discovery support not available)
+	fi
+    fi
+
+fi
+
+#################################################
 # Check to see if we should use the included iniparser
 
 AC_ARG_WITH(included-iniparser,
@@ -6467,6 +6501,9 @@ fi
 if test x"$with_dnsupdate_support" != x"no"; then
     AC_MSG_RESULT([    UUID_LIBS = $UUID_LIBS])
 fi
+if test x"$have_dnssd_support" != x"no"; then
+    AC_MSG_RESULT([    DNSSD_LIBS = $DNSSD_LIBS])
+fi
 AC_MSG_RESULT([    AUTH_LIBS = $AUTH_LIBS])
 
 #################################################


-- 
Samba Shared Repository