CUPS did not compile when Avahi or mDNSResponder was not present (STR #4402)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11871 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES-1.7.txt b/CHANGES-1.7.txt
index de48160f4dfb2425a62791978a8acacf11903f6f..293bed025796e3f946a3980b8fbbfbbd038a6afe 100644 (file)
--- a/CHANGES-1.7.txt
+++ b/CHANGES-1.7.txt
@@ -19,6 +19,8 @@ CHANGES IN CUPS V1.7.3
          (STR #4397)
        - The configure script incorrectly added libgcrypt as a GNU TLS
          dependency (STR #4399)
+       - CUPS did not compile when Avahi or mDNSResponder was not present
+         (STR #4402)
 
 
 CHANGES IN CUPS V1.7.2

diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index 495bf1b7f51f9e8f32d6befb2577f330518d01ad..4e417b0b29f5bf17253d44ba457ca25bdefbd0a7 100644 (file)
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -237,11 +237,13 @@ cupsdStartBrowsing(void)
   if (BrowseLocalProtocols & BROWSE_SMB)
     update_smb(1);
 
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
  /*
   * Register the individual printers
   */
 
   dnssdRegisterAllPrinters(0);
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
 }
 
 
@@ -255,6 +257,7 @@ cupsdStopBrowsing(void)
   if (!Browsing || !BrowseLocalProtocols)
     return;
 
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
  /*
   * De-register the individual printers
   */
@@ -265,7 +268,6 @@ cupsdStopBrowsing(void)
   * Shut down browsing sockets...
   */
 
-#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
   if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDMaster)
     dnssdStop();
 #endif /* HAVE_DNSSD || HAVE_AVAHI */