Merge changes from CUPS 1.6svn-r9939.

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

diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4
index 412edf1fa4c441cb5c921d886a5db55ef2ac2d2d..eebbb29bb71aaeedfeff908473cfcb9070016dbd 100644 (file)
--- a/config-scripts/cups-defaults.m4
+++ b/config-scripts/cups-defaults.m4
@@ -3,7 +3,7 @@ dnl "$Id: cups-defaults.m4 7959 2008-09-17 19:30:58Z mike $"
 dnl
 dnl   Default cupsd configuration settings for CUPS.
 dnl
-dnl   Copyright 2007-2010 by Apple Inc.
+dnl   Copyright 2007-2011 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
@@ -27,7 +27,7 @@ AC_SUBST(LANGUAGES)
 dnl Mac OS X bundle-based localization support
 AC_ARG_WITH(bundledir, [  --with-bundledir     set Mac OS X localization bundle directory ],
        CUPS_BUNDLEDIR="$withval",
-       if test "x$uname" = xDarwin; then
+       if test "x$uname" = xDarwin -a $uversion -ge 100; then
                CUPS_BUNDLEDIR="/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A"
                LANGUAGES=""
        else
@@ -434,42 +434,6 @@ AC_ARG_WITH(ipp-port, [  --with-ipp-port         set port number for IPP, defaul
 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 Fonts
-if test "x$BANNERTOPS" = x -a "x$TEXTTOPS" = x; then
-       FONTS=""
-else
-       FONTS="fonts"
-fi
-
-AC_SUBST(FONTS)
-
 dnl Web interface...
 AC_ARG_ENABLE(webif, [  --enable-webif          enable the web interface by default, default=no for Mac OS X])
 case "x$enable_webif" in