Merge changes from CUPS 1.4svn-r7932.

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

diff --git a/config.h.in b/config.h.in
index 9bcf7181f2942302f2ac2585c6dc7761837d71a9..5199ee4f381dd3a3e547bc854fb908de9f89a817 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -1,9 +1,9 @@
 /*
- * "$Id: config.h.in 6930 2007-09-08 00:28:06Z 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
@@ -42,6 +42,21 @@
 #define CUPS_DEFAULT_LOG_FILE_PERM     0644
 
 
+/*
+ * Default logging settings...
+ */
+
+#define CUPS_DEFAULT_LOG_LEVEL "warn"
+#define CUPS_DEFAULT_ACCESS_LOG_LEVEL "actions"
+
+
+/*
+ * Default fatal error settings...
+ */
+
+#define CUPS_DEFAULT_FATAL_ERRORS      "config"
+
+
 /*
  * Default browsing settings...
  */
@@ -132,6 +147,7 @@
 
 #undef HAVE_PAM_PAM_APPL_H
 #undef HAVE_PAM_SET_ITEM
+#undef HAVE_PAM_SETCRED
 
 
 /*
@@ -299,6 +315,10 @@
 
 #undef HAVE_LDAP
 #undef HAVE_OPENLDAP
+#undef HAVE_MOZILLA_LDAP
+#undef HAVE_LDAP_SSL_H
+#undef HAVE_LDAP_SSL
+#undef HAVE_LDAP_REBIND_PROC
 
 
 /*
@@ -380,6 +400,20 @@
 #undef HAVE_HSTRERROR
 
 
+/*
+ * Do we have res_init()?
+ */
+
+#undef HAVE_RES_INIT
+
+
+/*
+ * Do we have <resolv.h>
+ */
+
+#undef HAVE_RESOLV_H
+
+
 /*
  * Do we have the <sys/sockio.h> header file?
  */
@@ -434,9 +468,18 @@
  * 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?
  */
@@ -553,8 +596,31 @@
 #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
+
+
+/*
+ * Do we have libwrap and tcpd.h?
+ */
+
+#undef HAVE_TCPD_H
+
+
 #endif /* !_CUPS_CONFIG_H_ */
 
 /*
- * End of "$Id: config.h.in 6930 2007-09-08 00:28:06Z mike $".
+ * End of "$Id: config.h.in 7687 2008-06-24 01:28:36Z mike $".
  */