From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Thu, 20 Nov 2014 17:07:58 +0000 (+0000)
Subject: CUPS did not compile without Avahi or mDNSResponder (STR #4523)
X-Git-Tag: v2.2b1~432
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51e07447b27c408ad128f1e58cd40d63fe6ef64a;p=thirdparty%2Fcups.git

CUPS did not compile without Avahi or mDNSResponder (STR #4523)



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

diff --git a/CHANGES-2.0.txt b/CHANGES-2.0.txt
index 34da6f8726..6aa6895c82 100644
--- a/CHANGES-2.0.txt
+++ b/CHANGES-2.0.txt
@@ -7,7 +7,8 @@ CHANGES IN CUPS V2.0.2
 	  (<rdar://problem/14546232>)
 	- The scheduler incorrectly cleared the MakeModel string in the
 	  printers.conf file after a restart (<rdar://problem/16827518>)
-	- CUPS did not work with older versions of GNU TLS (STR #4527)
+	- CUPS did not compile with older versions of GNU TLS (STR #4527)
+	- CUPS did not compile without Avahi or mDNSResponder (STR #4523)
 
 
 CHANGES IN CUPS V2.0.1
diff --git a/test/ippserver.c b/test/ippserver.c
index 212758b978..2a69830494 100644
--- a/test/ippserver.c
+++ b/test/ippserver.c
@@ -419,12 +419,12 @@ static int		valid_job_attributes(_ipp_client_t *client);
  * Globals...
  */
 
-#  ifdef HAVE_DNSSD
+#ifdef HAVE_DNSSD
 static DNSServiceRef	DNSSDMaster = NULL;
-#  else /* HAVE_AVAHI */
+#elif defined(HAVE_AVAHI)
 static AvahiThreadedPoll *DNSSDMaster = NULL;
 static AvahiClient	*DNSSDClient = NULL;
-#  endif /* HAVE_DNSSD */
+#endif /* HAVE_DNSSD */
 
 static int		KeepFiles = 0,
 			Verbosity = 0;