Import changes from CUPS 1.4svn-r8704.

[thirdparty/cups.git] / config-scripts / cups-defaults.m4

diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4
index 624b3d6f2558b9c676b5e24c4139c3473a864384..53359e2a9123ac134b967a60b9ea293e5e2c70fc 100644 (file)
--- a/config-scripts/cups-defaults.m4
+++ b/config-scripts/cups-defaults.m4
@@ -1,10 +1,10 @@
 dnl
-dnl "$Id: cups-defaults.m4 7649 2008-06-16 17:46:57Z mike $"
+dnl "$Id: cups-defaults.m4 7959 2008-09-17 19:30:58Z mike $"
 dnl
 dnl   Default cupsd configuration settings for the Common UNIX Printing System
 dnl   (CUPS).
 dnl
-dnl   Copyright 2007-2008 by Apple Inc.
+dnl   Copyright 2007-2009 by Apple Inc.
 dnl   Copyright 2006-2007 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
@@ -43,6 +43,14 @@ AC_ARG_WITH(log_file_perm, [  --with-log-file-perm    set default LogFilePerm va
 AC_SUBST(CUPS_LOG_FILE_PERM)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LOG_FILE_PERM, 0$CUPS_LOG_FILE_PERM)
 
+dnl Default FatalErrors
+AC_ARG_WITH(fatal_errors, [  --with-fatal-errors     set default FatalErrors value, default=config],
+       CUPS_FATAL_ERRORS="$withval",
+       CUPS_FATAL_ERRORS="config")
+AC_SUBST(CUPS_FATAL_ERRORS)
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_FATAL_ERRORS, "$CUPS_FATAL_ERRORS")
+
+
 dnl Default LogLevel
 AC_ARG_WITH(log_level, [  --with-log-level        set default LogLevel value, default=warn],
        CUPS_LOG_LEVEL="$withval",
@@ -51,14 +59,14 @@ AC_SUBST(CUPS_LOG_LEVEL)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LOG_LEVEL, "$CUPS_LOG_LEVEL")
 
 dnl Default AccessLogLevel
-AC_ARG_WITH(log_level, [  --with-access-log-level set default AccessLogLevel value, default=actions],
-       CUPS_LOG_LEVEL="$withval",
-       CUPS_LOG_LEVEL="actions")
+AC_ARG_WITH(access_log_level, [  --with-access-log-level set default AccessLogLevel value, default=actions],
+       CUPS_ACCESS_LOG_LEVEL="$withval",
+       CUPS_ACCESS_LOG_LEVEL="actions")
 AC_SUBST(CUPS_ACCESS_LOG_LEVEL)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_ACCESS_LOG_LEVEL, "$CUPS_ACCESS_LOG_LEVEL")
 
 dnl Default Browsing
-AC_ARG_ENABLE(browsing, [  --enable-browsing       enable Browsing by default, default=yes])
+AC_ARG_ENABLE(browsing, [  --disable-browsing      disable Browsing by default])
 if test "x$enable_browsing" = xno; then
        CUPS_BROWSING="No"
        AC_DEFINE_UNQUOTED(CUPS_DEFAULT_BROWSING, 0)
@@ -115,8 +123,8 @@ AC_DEFINE_UNQUOTED(CUPS_DEFAULT_BROWSE_REMOTE_PROTOCOLS,
        "$CUPS_BROWSE_REMOTE_PROTOCOLS")
 
 dnl Default BrowseShortNames
-AC_ARG_ENABLE(browse_short, [  --enable-browse-short-names
-                          enable BrowseShortNames by default, default=yes])
+AC_ARG_ENABLE(browse_short, [  --disable-browse-short-names
+                         disable BrowseShortNames by default])
 if test "x$enable_browse_short" = xno; then
        CUPS_BROWSE_SHORT_NAMES="No"
        AC_DEFINE_UNQUOTED(CUPS_DEFAULT_BROWSE_SHORT_NAMES, 0)
@@ -127,7 +135,8 @@ fi
 AC_SUBST(CUPS_BROWSE_SHORT_NAMES)
 
 dnl Default DefaultShared
-AC_ARG_ENABLE(default_shared, [  --enable-default-shared enable DefaultShared by default, default=yes])
+AC_ARG_ENABLE(default_shared, [  --disable-default-shared
+                         disable DefaultShared by default])
 if test "x$enable_default_shared" = xno; then
        CUPS_DEFAULT_SHARED="No"
        AC_DEFINE_UNQUOTED(CUPS_DEFAULT_DEFAULT_SHARED, 0)
@@ -138,8 +147,8 @@ fi
 AC_SUBST(CUPS_DEFAULT_SHARED)
 
 dnl Default ImplicitClasses
-AC_ARG_ENABLE(implicit, [  --enable-implicit-classes
-                          enable ImplicitClasses by default, default=yes])
+AC_ARG_ENABLE(implicit, [  --disable-implicit-classes
+                          disable ImplicitClasses by default])
 if test "x$enable_implicit" = xno; then
        CUPS_IMPLICIT_CLASSES="No"
        AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IMPLICIT_CLASSES, 0)
@@ -151,7 +160,7 @@ AC_SUBST(CUPS_IMPLICIT_CLASSES)
 
 dnl Default UseNetworkDefault
 AC_ARG_ENABLE(use_network_default, [  --enable-use-network-default
-                          enable UseNetworkDefault by default, default=auto])
+                          set UseNetworkDefault to Yes by default])
 if test "x$enable_use_network_default" != xno; then
        AC_MSG_CHECKING(whether to use network default printers)
        if test "x$enable_use_network_default" = xyes -o $uname != Darwin; then
@@ -282,7 +291,7 @@ if test x$default_printcap != xno; then
                case $uname in
                        Darwin*)
                                if test $uversion -ge 90; then
-                                       CUPS_DEFAULT_PRINTCAP=""
+                                       CUPS_DEFAULT_PRINTCAP="/Library/Preferences/org.cups.printers.plist"
                                else
                                        CUPS_DEFAULT_PRINTCAP="/etc/printcap"
                                fi
@@ -301,6 +310,7 @@ else
        CUPS_DEFAULT_PRINTCAP=""
 fi
 
+AC_SUBST(CUPS_DEFAULT_PRINTCAP)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_PRINTCAP, "$CUPS_DEFAULT_PRINTCAP")
 
 dnl Default LPD config file...
@@ -353,28 +363,17 @@ fi
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_SMB_CONFIG_FILE, "$CUPS_DEFAULT_SMB_CONFIG_FILE")
 
 dnl Default MaxCopies value...
-AC_ARG_WITH(max-copies, [  --with-max-copies       set default max copies value, default=auto ],
+AC_ARG_WITH(max-copies, [  --with-max-copies       set default max copies value, default=9999 ],
        CUPS_MAX_COPIES="$withval",
-       if test "x$uname" = xDarwin; then
-               CUPS_MAX_COPIES="9999"
-       else
-               CUPS_MAX_COPIES="100"
-       fi)
+       CUPS_MAX_COPIES="9999")
 
 AC_SUBST(CUPS_MAX_COPIES)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_MAX_COPIES, $CUPS_MAX_COPIES)
 
 dnl Default raw printing state
-AC_ARG_ENABLE(raw_printing, [  --enable-raw-printing   enable raw printing by default, default=auto])
+AC_ARG_ENABLE(raw_printing, [  --disable-raw-printing  do not allow raw printing by default])
 if test "x$enable_raw_printing" != xno; then
-       AC_MSG_CHECKING(whether to enable raw printing)
-       if test "x$enable_raw_printing" = xyes -o $uname = Darwin; then
-               DEFAULT_RAW_PRINTING=""
-               AC_MSG_RESULT(yes)
-       else
-               DEFAULT_RAW_PRINTING="#"
-               AC_MSG_RESULT(no)
-       fi
+       DEFAULT_RAW_PRINTING=""
 else
        DEFAULT_RAW_PRINTING="#"
 fi
@@ -401,13 +400,40 @@ AC_SUBST(CUPS_SNMP_ADDRESS)
 AC_SUBST(CUPS_SNMP_COMMUNITY)
 
 dnl New default port definition for IPP...
-AC_ARG_WITH(ipp-port, [  --with-ipp-port         set default port number for IPP ],
+AC_ARG_WITH(ipp-port, [  --with-ipp-port         set port number for IPP, default=631 ],
        DEFAULT_IPP_PORT="$withval",
        DEFAULT_IPP_PORT="631")
 
 AC_SUBST(DEFAULT_IPP_PORT)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)
 
+dnl Filters
+AC_ARG_ENABLE(bannertops, [  --enable-bannertops     always build the banner filter ])
+AC_ARG_ENABLE(texttops, [  --enable-texttops       always build the text filter ])
+
+if test "x$enable_bannertops" = xno; then
+       BANNERTOPS=""
+elif test "x$enable_bannertops" = xyes; then
+       BANNERTOPS="bannertops"
+elif test $uname = Darwin; then
+       BANNERTOPS=""
+else
+       BANNERTOPS="bannertops"
+fi
+
+if test "x$enable_texttops" = xno; then
+       TEXTTOPS=""
+elif test "x$enable_texttops" = xyes; then
+       TEXTTOPS="texttops"
+elif test $uname = Darwin; then
+       TEXTTOPS=""
+else
+       TEXTTOPS="texttops"
+fi
+
+AC_SUBST(BANNERTOPS)
+AC_SUBST(TEXTTOPS)
+
 dnl
-dnl End of "$Id: cups-defaults.m4 7649 2008-06-16 17:46:57Z mike $".
+dnl End of "$Id: cups-defaults.m4 7959 2008-09-17 19:30:58Z mike $".
 dnl