Import changes from CUPS 1.4svn-r8704.

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

diff --git a/config-scripts/cups-image.m4 b/config-scripts/cups-image.m4
index 22cb798f49f2c0ce6d91e1d8f184fa9892cea18c..f25d58732d0a4b1d47ca4de4b4e10e0789bf72b6 100644 (file)
--- a/config-scripts/cups-image.m4
+++ b/config-scripts/cups-image.m4
@@ -1,29 +1,20 @@
 dnl
-dnl "$Id: cups-image.m4 5580 2006-05-23 19:30:23Z mike $"
+dnl "$Id: cups-image.m4 6649 2007-07-11 21:46:42Z mike $"
 dnl
 dnl   Image library/filter stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007-2009 by Apple Inc.
 dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 dnl See if we want the image filters included at all...
-AC_ARG_ENABLE(image, [  --enable-image          turn on image filters, default=auto])
+AC_ARG_ENABLE(image, [  --enable-image          always build the image filters])
 
 IMGFILTERS=""
 if test "x$enable_image" != xno; then
@@ -39,9 +30,9 @@ fi
 AC_SUBST(IMGFILTERS)
 
 dnl Check for image libraries...
-AC_ARG_ENABLE(jpeg, [  --enable-jpeg           turn on JPEG support, default=yes])
-AC_ARG_ENABLE(png, [  --enable-png            turn on PNG support, default=yes])
-AC_ARG_ENABLE(tiff, [  --enable-tiff           turn on TIFF support, default=yes])
+AC_ARG_ENABLE(jpeg, [  --disable-jpeg          disable JPEG support])
+AC_ARG_ENABLE(png, [  --disable-png           disable PNG support])
+AC_ARG_ENABLE(tiff, [  --disable-tiff          disable TIFF support])
 
 LIBJPEG=""
 LIBPNG=""
@@ -114,5 +105,5 @@ AC_SUBST(EXPORT_LIBZ)
 AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H))
 
 dnl
-dnl End of "$Id: cups-image.m4 5580 2006-05-23 19:30:23Z mike $".
+dnl End of "$Id: cups-image.m4 6649 2007-07-11 21:46:42Z mike $".
 dnl