License change: Apache License, Version 2.0.

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

diff --git a/xcode/config.h b/xcode/config.h
index d7765b3f79ce662ec82b93161ec75bcb5096adfc..458770de0520ae9a0e5c23e75c8a0069650ae7c5 100644 (file)
--- a/xcode/config.h
+++ b/xcode/config.h
@@ -1,14 +1,10 @@
 /*
  * Configuration file for CUPS and Xcode.
  *
- * Copyright 2007-2016 by Apple Inc.
+ * Copyright 2007-2017 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products.
  *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file.  If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
  */
 
 #ifndef _CUPS_CONFIG_H_
@@ -22,8 +18,8 @@
  * Version of software...
  */
 
-#define CUPS_SVERSION "CUPS v2.2"
-#define CUPS_MINIMAL "CUPS/2.2"
+#define CUPS_SVERSION "CUPS v2.3.0"
+#define CUPS_MINIMAL "CUPS/2.3.0"
 
 
 /*
@@ -50,7 +46,7 @@
  */
 
 #define CUPS_DEFAULT_LOG_LEVEL "warn"
-#define CUPS_DEFAULT_ACCESS_LOG_LEVEL "actions"
+#define CUPS_DEFAULT_ACCESS_LOG_LEVEL "none"
 
 
 /*
@@ -246,18 +242,11 @@
 #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*/
+/* #undef HAVE_SYSTEMD_SD_JOURNAL_H */
 
 
 /*
@@ -312,6 +301,7 @@
 
 #define HAVE_CDSASSL 1
 /* #undef HAVE_GNUTLS */
+/* #undef HAVE_SSPISSL */
 #define HAVE_SSL 1
 
 
@@ -493,29 +483,33 @@
 #define HAVE_PTHREAD_H 1
 
 
+/*
+ * Do we have on-demand support (launchd/systemd/upstart)?
+ */
+
+#define HAVE_ONDEMAND 1
+
+
 /*
  * Do we have launchd support?
  */
 
 #define HAVE_LAUNCH_H 1
 #define HAVE_LAUNCHD 1
-#define HAVE_LAUNCH_ACTIVATE_SOCKET 1
 
 
 /*
- * Various scripting languages...
+ * Do we have systemd support?
  */
 
-#if !TARGET_OS_IOS
-#  define HAVE_JAVA 1
-#  define CUPS_JAVA "/usr/bin/java"
-#  define HAVE_PERL 1
-#  define CUPS_PERL "/usr/bin/perl"
-#  define HAVE_PHP 1
-#  define CUPS_PHP "/usr/bin/php"
-#  define HAVE_PYTHON 1
-#  define CUPS_PYTHON "/usr/bin/python"
-#endif /* !TARGET_OS_IOS */
+/* #undef HAVE_SYSTEMD */
+
+
+/*
+ * Do we have upstart support?
+ */
+
+/* #undef HAVE_UPSTART */
 
 
 /*
@@ -575,6 +569,7 @@
 
 /* #undef HAVE_DBUS */
 /* #undef HAVE_DBUS_MESSAGE_ITER_INIT_APPEND */
+/* #undef HAVE_DBUS_THREADS_INIT */
 
 
 /*
@@ -582,7 +577,7 @@
  */
 
 #if !TARGET_OS_IOS
-#  define HAVE_GSS_ACQUIRE_CRED_EX_F 1
+#  define HAVE_GSS_ACQUIRED_CRED_EX_F 1
 #  define HAVE_GSS_C_NT_HOSTBASED_SERVICE 1
 #  define HAVE_GSS_GSSAPI_H 1
 /* #undef HAVE_GSS_GSSAPI_SPI_H */
@@ -653,7 +648,7 @@
 
 #ifdef HAVE_ARC4RANDOM
 #  define CUPS_RAND() arc4random()
-#  define CUPS_SRAND(v) arc4random_stir()
+#  define CUPS_SRAND(v)
 #elif defined(HAVE_RANDOM)
 #  define CUPS_RAND() random()
 #  define CUPS_SRAND(v) srandom(v)