Merge changes from CUPS 1.4svn-r7696.

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

diff --git a/config.h.in b/config.h.in
index cdc5853be7c8878fd34ced868ee5b3da95a5e057..7c54621fcd1bed3e2f08b4440859f0be0cdbc013 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -1,9 +1,9 @@
 /*
- * "$Id: config.h.in 6720 2007-07-25 00:40:03Z mike $"
+ * "$Id: config.h.in 7687 2008-06-24 01:28:36Z mike $"
  *
  *   Configuration file for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2008 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -70,17 +70,18 @@
 
 
 /*
- * Default MaxCopies value...
+ * Default Samba and LPD config files...
  */
 
-#define CUPS_DEFAULT_MAX_COPIES        100
+#define CUPS_DEFAULT_SMB_CONFIG_FILE   ""
+#define CUPS_DEFAULT_LPD_CONFIG_FILE   ""
 
 
 /*
- * Maximum number of file descriptors to support.
+ * Default MaxCopies value...
  */
 
-#define CUPS_MAX_FDS           4096
+#define CUPS_DEFAULT_MAX_COPIES        100
 
 
 /*
@@ -130,6 +131,7 @@
 #endif /* !HAVE_LIBPAM */
 
 #undef HAVE_PAM_PAM_APPL_H
+#undef HAVE_PAM_SET_ITEM
 
 
 /*
@@ -428,6 +430,22 @@
 #define CUPS_PYTHON    "/usr/bin/python"
 
 
+/*
+ * Location of the poppler/Xpdf pdftops program...
+ */
+
+#undef HAVE_PDFTOPS
+#define CUPS_PDFTOPS   "/usr/bin/pdftops"
+
+
+/*
+ * Location of the Ghostscript gs program...
+ */
+
+#undef HAVE_GHOSTSCRIPT
+#define CUPS_GHOSTSCRIPT "/usr/bin/gs"
+
+
 /*
  * Do we have Darwin's CoreFoundation and SystemConfiguration frameworks?
  */
@@ -445,13 +463,6 @@
 #undef HAVE_CFBUNDLEPRIV_H
 
 
-/*
- * Do we have CFLocaleCreateCanonicalLocaleIdentifierFromString()?
- */
-
-#undef HAVE_CF_LOCALE_ID
-
-
 /*
  * Do we have MacOSX 10.4's mbr_XXX functions()?
  */
@@ -495,7 +506,7 @@
 #undef HAVE_GSSAPI_GSSAPI_KRB5_H
 #undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY
 #undef HAVE_GSS_C_NT_HOSTBASED_SERVICE
-#undef HAVE_KRB5_CC_RESOLVE
+#undef HAVE_KRB5_CC_NEW_UNIQUE
 #undef HAVE_KRB5_H
 #undef HAVE_HEIMDAL
 
@@ -523,6 +534,13 @@
 #undef HAVE_DLFCN_H
 
 
+/*
+ * Do we have <sys/param.h>?
+ */
+
+#undef HAVE_SYS_PARAM_H
+
+
 /*
  * Do we have <sys/ucred.h>?
  */
@@ -537,8 +555,31 @@
 #undef HAVE_REMOVEFILE
 
 
+/*
+ * Do we have <sandbox.h>?
+ */
+
+#undef HAVE_SANDBOX_H
+
+
+/*
+ * Which random number generator function to use...
+ */
+
+#undef HAVE_RANDOM
+#undef HAVE_MRAND48
+#undef HAVE_LRAND48
+
+
+/*
+ * Do we have libusb?
+ */
+
+#undef HAVE_USB_H
+
+
 #endif /* !_CUPS_CONFIG_H_ */
 
 /*
- * End of "$Id: config.h.in 6720 2007-07-25 00:40:03Z mike $".
+ * End of "$Id: config.h.in 7687 2008-06-24 01:28:36Z mike $".
  */