Cleanup builds without DNS-SD (STR #4087)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10471 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/config-scripts/cups-dnssd.m4 b/config-scripts/cups-dnssd.m4
index c0720d1400f525ceada256fac78cfeb8dcc8bbb3..b78289bc454e5b17244ff5372521b79bc0965e76 100644 (file)
--- a/config-scripts/cups-dnssd.m4
+++ b/config-scripts/cups-dnssd.m4
@@ -43,8 +43,6 @@ if test "x$DNSSD_BACKEND" = x -a x$enable_dnssd != xno; then
                        Darwin*)
                                # Darwin and MacOS X...
                                AC_DEFINE(HAVE_DNSSD)
-                               AC_DEFINE(HAVE_COREFOUNDATION)
-                               AC_DEFINE(HAVE_SYSTEMCONFIGURATION)
                                DNSSDLIBS="-framework CoreFoundation -framework SystemConfiguration"
                                DNSSD_BACKEND="dnssd"
                                ;;

diff --git a/config.h.in b/config.h.in
index 85d0c7ce747d1f38f7b9893bb679c45faa6762ba..0acc5f8343cebb1146994a4460ea20e6600bc4ab 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -537,14 +537,6 @@
 #define CUPS_GHOSTSCRIPT "/usr/bin/gs"
 
 
-/*
- * Do we have Darwin's CoreFoundation and SystemConfiguration frameworks?
- */
-
-#undef HAVE_COREFOUNDATION
-#undef HAVE_SYSTEMCONFIGURATION
-
-
 /*
  * Do we have CoreFoundation public and private headers?
  */

diff --git a/cups/http-addr.c b/cups/http-addr.c
index 293a1db764499cab4e47ced1c2dc3e0fe8beabca..ef955d776b2f2f87b602eb73ace6bd62d8466acd 100644 (file)
--- a/cups/http-addr.c
+++ b/cups/http-addr.c
@@ -34,12 +34,10 @@
 #ifdef HAVE_RESOLV_H
 #  include <resolv.h>
 #endif /* HAVE_RESOLV_H */
-#ifdef HAVE_COREFOUNDATION
+#ifdef __APPLE__
 #  include <CoreFoundation/CoreFoundation.h>
-#endif /* HAVE_COREFOUNDATION */
-#ifdef HAVE_SYSTEMCONFIGURATION
 #  include <SystemConfiguration/SystemConfiguration.h>
-#endif /* HAVE_SYSTEMCONFIGURATION */
+#endif /* __APPLE__ */
 
 
 /*

diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index efa8eac4d452dddabf4b62fce014e144faea01f8..c215205395416cbf1a521c721b6bf81de9f16b2d 100644 (file)
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -52,12 +52,8 @@
 
 #if defined(HAVE_DNSSD) && defined(__APPLE__)
 #  include <nameser.h>
-#  ifdef HAVE_COREFOUNDATION
-#    include <CoreFoundation/CoreFoundation.h>
-#  endif /* HAVE_COREFOUNDATION */
-#  ifdef HAVE_SYSTEMCONFIGURATION
-#    include <SystemConfiguration/SystemConfiguration.h>
-#  endif /* HAVE_SYSTEMCONFIGURATION */
+#  include <CoreFoundation/CoreFoundation.h>
+#  include <SystemConfiguration/SystemConfiguration.h>
 #endif /* HAVE_DNSSD && __APPLE__ */
 
 
@@ -140,8 +136,10 @@ cupsdDeregisterPrinter(
   * Announce the deletion...
   */
 
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
   if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDMaster)
     dnssdDeregisterPrinter(p, 1);
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
 }
 
 
@@ -160,8 +158,10 @@ cupsdRegisterPrinter(cupsd_printer_t *p)/* I - Printer */
       (p->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_SCANNER)))
     return;
 
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
   if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDMaster)
     dnssdRegisterPrinter(p);
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
 }
 
 
@@ -342,13 +342,13 @@ void
 cupsdUpdateDNSSDName(void)
 {
   char         webif[1024];            /* Web interface share name */
-#  ifdef HAVE_SYSTEMCONFIGURATION
+#  ifdef __APPLE__
   SCDynamicStoreRef sc;                        /* Context for dynamic store */
   CFDictionaryRef btmm;                        /* Back-to-My-Mac domains */
   CFStringEncoding nameEncoding;       /* Encoding of computer name */
   CFStringRef  nameRef;                /* Host name CFString */
   char         nameBuffer[1024];       /* C-string buffer */
-#  endif /* HAVE_SYSTEMCONFIGURATION */
+#  endif /* __APPLE__ */
 
 
  /*
@@ -363,7 +363,7 @@ cupsdUpdateDNSSDName(void)
   * Get the computer name as a c-string...
   */
 
-#  ifdef HAVE_SYSTEMCONFIGURATION
+#  ifdef __APPLE__
   sc = SCDynamicStoreCreate(kCFAllocatorDefault, CFSTR("cupsd"), NULL, NULL);
 
   if (sc)
@@ -454,7 +454,7 @@ cupsdUpdateDNSSDName(void)
     CFRelease(sc);
   }
   else
-#  endif /* HAVE_SYSTEMCONFIGURATION */
+#  endif /* __APPLE__ */
 #  ifdef HAVE_AVAHI
   {
     cupsdSetString(&DNSSDComputerName, avahi_client_get_host_name(DNSSDClient));

diff --git a/scheduler/sysman.c b/scheduler/sysman.c
index 6f49e83c7372ba45f942ee1513c3ace5293bcbf9..0a0aeea4c0971ec13927234a4d70eef64832a591 100644 (file)
--- a/scheduler/sysman.c
+++ b/scheduler/sysman.c
@@ -974,11 +974,13 @@ sysUpdate(void)
             p = (cupsd_printer_t *)cupsArrayNext(Printers))
          cupsdDeregisterPrinter(p, 1);
 
+#  if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
        /*
         * Update the computer name and BTMM domain list...
        */
 
        cupsdUpdateDNSSDName();
+#  endif /* HAVE_DNSSD || HAVE_AVAHI */
 
        /*
        * Now re-register them...

diff --git a/scheduler/tls-darwin.c b/scheduler/tls-darwin.c
index 6d53d63a51146a41112a9e5dae387b1e536b0768..1f138c7a1c649775f2a594f96edbc8bfbb1f2e70 100644 (file)
--- a/scheduler/tls-darwin.c
+++ b/scheduler/tls-darwin.c
@@ -173,7 +173,9 @@ copy_cdsa_certificate(
                                        /* Server name */
   CFMutableDictionaryRef query = NULL; /* Query qualifiers */
   CFArrayRef           list = NULL;    /* Keychain list */
+#    if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
   char                 localname[1024];/* Local hostname */
+#    endif /* HAVE_DNSSD || HAVE_AVAHI */
 #  elif defined(HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY)
   SecPolicyRef         policy = NULL;  /* Policy ref */
   SecPolicySearchRef   policy_search = NULL;
@@ -232,6 +234,7 @@ copy_cdsa_certificate(
 
   err = SecItemCopyMatching(query, (CFTypeRef *)&identity);
 
+#    if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
   if (err && DNSSDHostName)
   {
    /*
@@ -265,6 +268,7 @@ copy_cdsa_certificate(
 
     err = SecItemCopyMatching(query, (CFTypeRef *)&identity);
   }
+#    endif /* HAVE_DNSSD || HAVE_AVAHI */
 
   if (err)
   {
@@ -320,6 +324,7 @@ copy_cdsa_certificate(
 
   err = SecIdentitySearchCopyNext(search, &identity);
 
+#    if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
   if (err && DNSSDHostName)
   {
    /*
@@ -357,6 +362,7 @@ copy_cdsa_certificate(
     err = SecIdentitySearchCopyNext(search, &identity);
 
   }
+#    endif /* HAVE_DNSSD || HAVE_AVAHI */
 
   if (err)
   {
@@ -439,18 +445,22 @@ make_certificate(cupsd_client_t *con)     /* I - Client connection */
                *envp[MAX_ENV + 1],     /* Environment variables */
                keychain[1024],         /* Keychain argument */
                infofile[1024],         /* Type-in information for cert */
+#  if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
                localname[1024],        /* Local hostname */
+#  endif /* HAVE_DNSSD || HAVE_AVAHI */
                *servername;            /* Name of server in cert */
   cups_file_t  *fp;                    /* Seed/info file */
   int          infofd;                 /* Info file descriptor */
 
 
+#  if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
   if (con->servername && isdigit(con->servername[0] & 255) && DNSSDHostName)
   {
     snprintf(localname, sizeof(localname), "%s.local", DNSSDHostName);
     servername = localname;
   }
   else
+#  endif /* HAVE_DNSSD || HAVE_AVAHI */
     servername = con->servername;
 
  /*