Merge changes from CUPS 1.5svn-r9641

[thirdparty/cups.git] / config.h.in

diff --git a/config.h.in b/config.h.in
index 13e2da071327c97921b2cc4631081ffa6999729f..0f047a474a25005635b3fb96df4680c2f97bb87b 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -3,7 +3,7 @@
  *
  *   Configuration file for CUPS.
  *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -100,12 +100,19 @@
 
 
 /*
- * Do we have domain socket support?
+ * Do we have domain socket support, and if so what is the default one?
  */
 
 #undef CUPS_DEFAULT_DOMAINSOCKET
 
 
+/*
+ * Default WebInterface value...
+ */
+
+#undef CUPS_DEFAULT_WEBIF
+
+
 /*
  * Where are files stored?
  *
@@ -290,6 +297,7 @@
 
 #undef HAVE_AUTHORIZATION_H
 #undef HAVE_SECCERTIFICATE_H
+#undef HAVE_SECITEM_H
 #undef HAVE_SECITEMPRIV_H
 #undef HAVE_SECPOLICY_H
 #undef HAVE_SECPOLICYPRIV_H
@@ -297,12 +305,20 @@
 #undef HAVE_SECIDENTITYSEARCHPRIV_H
 
 
+/*
+ * Do we have the SecCertificateCopyData function?
+ */
+
+#undef HAVE_SECCERTIFICATECOPYDATA
+
+
 /*
  * Do we have the SecIdentitySearchCreateWithPolicy function?
  */
 
 #undef HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY
 
+
 /*
  * Do we have the SecPolicyCreateSSL function?
  */
@@ -541,6 +557,13 @@
 #undef HAVE_NOTIFY_POST
 
 
+/*
+ * Do we have Darwin's IOKit private headers?
+ */
+
+#undef HAVE_IOKIT_PWR_MGT_IOPMLIBPRIVATE_H
+
+
 /*
  * Do we have DBUS?
  */
@@ -687,6 +710,20 @@
 #undef HAVE_SYS_VFS_H
 
 
+/*
+ * Location of Mac OS X localization bundle, if any.
+ */
+
+#undef CUPS_BUNDLEDIR
+
+
+/*
+ * Do we have the ColorSyncRegisterDevice function?
+ */
+
+#undef HAVE_COLORSYNCREGISTERDEVICE
+
+
 #endif /* !_CUPS_CONFIG_H_ */
 
 /*