From 3e7fe0ca760ad0054cf5c9ec7c90ca415cf6eb06 Mon Sep 17 00:00:00 2001
From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Thu, 16 Feb 2012 22:03:53 +0000
Subject: Merge changes from CUPS 1.6svn-r10310.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3683 a1ca3aef-8c08-0410-bb20-df032aa958be
---
 config.h.in | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'config.h.in')

diff --git a/config.h.in b/config.h.in
index e5f383e15..9c1faf9ab 100644
--- a/config.h.in
+++ b/config.h.in
@@ -379,12 +379,19 @@
 
 
 /*
- * Do we have DNS Service Discovery (aka Bonjour)?
+ * Do we have mDNSResponder for DNS Service Discovery (aka Bonjour)?
  */
 
 #undef HAVE_DNSSD
 
 
+/*
+ * Do we have Avahi for DNS Service Discovery (aka Bonjour)?
+ */
+
+#undef HAVE_AVAHI
+
+
 /*
  * Do we have <sys/ioctl.h>?
  */
@@ -723,13 +730,6 @@
 #undef CUPS_BUNDLEDIR
 
 
-/*
- * Do we have the ColorSyncRegisterDevice function?
- */
-
-#undef HAVE_COLORSYNCREGISTERDEVICE
-
-
 /*
  * Do we have XPC?
  */
-- 
cgit v1.2.1