Bump versions.

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

diff --git a/xcode/config.h b/xcode/config.h
index 94a6f5d8534c4e08c16615a213836f5fd690816b..418c944aa9fdae5b31cd8e733f63b1e24cab352a 100644 (file)
--- a/xcode/config.h
+++ b/xcode/config.h
@@ -3,7 +3,7 @@
  *
  * Configuration file for CUPS and Xcode.
  *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products.
  *
  * These coded instructions, statements, and computer programs are the
@@ -16,12 +16,14 @@
 #ifndef _CUPS_CONFIG_H_
 #define _CUPS_CONFIG_H_
 
+#include <AvailabilityMacros.h>
+
 /*
  * Version of software...
  */
 
-#define CUPS_SVERSION "CUPS v2.0.0"
-#define CUPS_MINIMAL "CUPS/2.0.0"
+#define CUPS_SVERSION "CUPS v2.1b2"
+#define CUPS_MINIMAL "CUPS/2.1b2"
 
 
 /*
@@ -245,6 +247,20 @@
 #define HAVE_VSYSLOG 1
 
 
+/*
+ * Do we have the ASL functions?
+ */
+
+#define HAVE_ASL_H
+
+
+/*
+ * Do we have the systemd journal functions?
+ */
+
+/*#undef HAVE_SYSTEMD_SD_JOURNAL_H*/
+
+
 /*
  * Do we have the (v)snprintf() functions?
  */
@@ -300,6 +316,20 @@
 #define HAVE_SSL 1
 
 
+/*
+ * Do we have the gnutls_transport_set_pull_timeout_function function?
+ */
+
+/* #undef HAVE_GNUTLS_TRANSPORT_SET_PULL_TIMEOUT_FUNCTION */
+
+
+/*
+ * Do we have the gnutls_priority_set_direct function?
+ */
+
+/* #undef HAVE_GNUTLS_PRIORITY_SET_DIRECT */
+
+
 /*
  * What Security framework headers do we have?
  */
@@ -336,6 +366,15 @@
 #define HAVE_SECKEYCHAINOPEN 1
 
 
+/*
+ * Do we have (a working) SSLSetEnabledCiphers function?
+ */
+
+#ifdef AVAILABLE_MAC_OS_X_VERSION_10_11_AND_LATER
+#  define HAVE_SSLSETENABLEDCIPHERS 1
+#endif /* AVAILABLE_MAC_OS_X_VERSION_10_11_AND_LATER */
+
+
 /*
  * Do we have libpaper?
  */
@@ -454,7 +493,7 @@
 
 #define HAVE_LAUNCH_H 1
 #define HAVE_LAUNCHD 1
-#undef HAVE_LAUNCH_ACTIVATE_SOCKET
+#define HAVE_LAUNCH_ACTIVATE_SOCKET 1
 
 
 /*
@@ -624,13 +663,6 @@
 #endif /* HAVE_ARC4RANDOM */
 
 
-/*
- * Do we have vproc_transaction_begin/end?
- */
-
-#define HAVE_VPROC_TRANSACTION_BEGIN 1
-
-
 /*
  * Do we have libusb?
  */