Changelog.

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

diff --git a/config.h.in b/config.h.in
index 8d4cd42ae7616d77e7652cbb103e3f337f5acb91..e708598aca0c4bb2d2c1cdd7fcf128dc4a0d3bc5 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -3,7 +3,7 @@
  *
  *   Configuration file for CUPS.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -32,6 +32,7 @@
 #define CUPS_DEFAULT_GROUP     "sys"
 #define CUPS_DEFAULT_SYSTEM_GROUPS     "sys root system"
 #define CUPS_DEFAULT_PRINTOPERATOR_AUTH        "@SYSTEM"
+#define CUPS_DEFAULT_SYSTEM_AUTHKEY    "system.print.admin"
 
 
 /*
@@ -62,12 +63,8 @@
  */
 
 #define CUPS_DEFAULT_BROWSING  1
-#define CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS    "CUPS"
-#define CUPS_DEFAULT_BROWSE_REMOTE_PROTOCOLS   "CUPS"
-#define CUPS_DEFAULT_BROWSE_SHORT_NAMES        1
+#define CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS    ""
 #define CUPS_DEFAULT_DEFAULT_SHARED 1
-#define CUPS_DEFAULT_IMPLICIT_CLASSES  1
-#define CUPS_DEFAULT_USE_NETWORK_DEFAULT 1
 
 
 /*
@@ -135,13 +132,11 @@
 
 
 /*
- * Do we have various image libraries?
+ * Do we have ZLIB?
  */
 
-#undef HAVE_LIBPNG
 #undef HAVE_LIBZ
-#undef HAVE_LIBJPEG
-#undef HAVE_LIBTIFF
+#undef HAVE_INFLATECOPY
 
 
 /*
@@ -172,10 +167,10 @@
 
 
 /*
- * Do we have <scsi/sg.h>?
+ * Use <stdint.h>?
  */
 
-#undef HAVE_SCSI_SG_H
+#undef HAVE_STDINT_H
 
 
 /*
@@ -299,6 +294,13 @@
 #undef HAVE_SSL
 
 
+/*
+ * Do we have the SSL_set_tlsext_host_name function?
+ */
+
+#undef HAVE_SSL_SET_TLSEXT_HOST_NAME
+
+
 /*
  * What Security framework headers do we have?
  */
@@ -314,41 +316,6 @@
 #undef HAVE_SECURETRANSPORTPRIV_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?
- */
-
-#undef HAVE_SECPOLICYCREATESSL
-
-
-/*
- * Do we have the SecPolicyCreateSSL function?
- */
-
-#undef HAVE_SECPOLICYCREATESSL
-
-
-/*
- * Do we have the SSLSetProtocolVersionMax function?
- */
-
-#undef HAVE_SSLSETPROTOCOLVERSIONMAX
-
-
 /*
  * Do we have the cssmErrorString function?
  */
@@ -357,36 +324,24 @@
 
 
 /*
- * Do we have the SLP library?
- */
-
-#undef HAVE_LIBSLP
-
-
-/*
- * Do we have an LDAP library?
+ * Do we have libpaper?
  */
 
-#undef HAVE_LDAP
-#undef HAVE_OPENLDAP
-#undef HAVE_MOZILLA_LDAP
-#undef HAVE_LDAP_SSL_H
-#undef HAVE_LDAP_SSL
-#undef HAVE_LDAP_REBIND_PROC
+#undef HAVE_LIBPAPER
 
 
 /*
- * Do we have libpaper?
+ * Do we have mDNSResponder for DNS Service Discovery (aka Bonjour)?
  */
 
-#undef HAVE_LIBPAPER
+#undef HAVE_DNSSD
 
 
 /*
- * Do we have DNS Service Discovery (aka Bonjour)?
+ * Do we have Avahi for DNS Service Discovery (aka Bonjour)?
  */
 
-#undef HAVE_DNSSD
+#undef HAVE_AVAHI
 
 
 /*
@@ -527,14 +482,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?
  */
@@ -559,7 +506,7 @@
 
 
 /*
- * Do we have Mac OS X 10.4's mbr_XXX functions?
+ * Do we have OS X 10.4's mbr_XXX functions?
  */
 
 #undef HAVE_MEMBERSHIP_H
@@ -599,11 +546,8 @@
 #undef HAVE_GSS_GSSAPI_H
 #undef HAVE_GSS_GSSAPI_SPI_H
 #undef HAVE_GSSAPI
-#undef HAVE_GSSAPI_GENERIC_H
 #undef HAVE_GSSAPI_GSSAPI_H
 #undef HAVE_GSSAPI_H
-#undef HAVE_GSSAPI_KRB5_H
-#undef HAVE_KRB5_H
 
 
 /*
@@ -691,7 +635,7 @@
  * Do we have libusb?
  */
 
-#undef HAVE_USB_H
+#undef HAVE_LIBUSB
 
 
 /*
@@ -721,25 +665,43 @@
 
 
 /*
- * Location of Mac OS X localization bundle, if any.
+ * Location of OS X localization bundle, if any.
  */
 
 #undef CUPS_BUNDLEDIR
 
 
 /*
- * Do we have the ColorSyncRegisterDevice function?
+ * Do we have XPC?
  */
 
-#undef HAVE_COLORSYNCREGISTERDEVICE
+#undef HAVE_XPC
+#undef HAVE_XPC_PRIVATE_H
 
 
 /*
- * Do we have XPC?
+ * Do we have Mini-XML?
  */
 
-#undef HAVE_XPC
+#undef HAVE_MXML_H
+
+
+/*
+ * Do we have the C99 abs() function?
+ */
 
+#undef HAVE_ABS
+#if !defined(HAVE_ABS) && !defined(abs)
+#  if defined(__GNUC__) || __STDC_VERSION__ >= 199901L
+#    define abs(x) _cups_abs(x)
+static inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
+#  elif defined(_MSC_VER)
+#    define abs(x) _cups_abs(x)
+static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
+#  else
+#    define abs(x) ((x) < 0 ? -(x) : (x))
+#  endif /* __GNUC__ || __STDC_VERSION__ */
+#endif /* !HAVE_ABS && !abs */
 
 #endif /* !_CUPS_CONFIG_H_ */