Merge changes from CUPS 1.5svn-r9400

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

diff --git a/config.h.in b/config.h.in
index af0813dc6a1028a545295bf2d7e864893129f6b6..1e0c22d2ff602e18185edd3a2c3a9b056d714939 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -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?
  *
@@ -289,6 +296,7 @@
  */
 
 #undef HAVE_AUTHORIZATION_H
+#undef HAVE_SECCERTIFICATE_H
 #undef HAVE_SECITEMPRIV_H
 #undef HAVE_SECPOLICY_H
 #undef HAVE_SECPOLICYPRIV_H
@@ -302,6 +310,12 @@
 
 #undef HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY
 
+/*
+ * Do we have the SecPolicyCreateSSL function?
+ */
+
+#undef HAVE_SECPOLICYCREATESSL
+
 
 /*
  * Do we have the SecPolicyCreateSSL function?
@@ -310,6 +324,13 @@
 #undef HAVE_SECPOLICYCREATESSL
 
 
+/*
+ * Do we have the cssmErrorString function?
+ */
+
+#undef HAVE_CSSMERRORSTRING
+
+
 /*
  * Do we have the SLP library?
  */
@@ -661,6 +682,32 @@
 #undef HAVE_ICONV_H
 
 
+/*
+ * Do we have statfs or statvfs and one of the corresponding headers?
+ */
+
+#undef HAVE_STATFS
+#undef HAVE_STATVFS
+#undef HAVE_SYS_MOUNT_H
+#undef HAVE_SYS_STATFS_H
+#undef HAVE_SYS_STATVFS_H
+#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_ */
 
 /*