Merge changes from CUPS 1.5svn-r9000.

[thirdparty/cups.git] / configure.in

diff --git a/configure.in b/configure.in
index 2b406cfabc12b4ca2f38736b628e02f3da276873..34198e412c481ec4be72d7e499d714d9e6f2ab93 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,25 +1,16 @@
 dnl
-dnl "$Id$"
+dnl "$Id: configure.in 7833 2008-08-04 20:55:13Z mike $"
 dnl
-dnl   Configuration script for the Common UNIX Printing System (CUPS).
+dnl   Configuration script for CUPS.
 dnl
-dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+dnl   Copyright 2007-2010 by Apple Inc.
+dnl   Copyright 1997-2007 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
 
 AC_INIT(cups/cups.h)
@@ -29,18 +20,22 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+sinclude(config-scripts/cups-3264.m4)
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
 
 sinclude(config-scripts/cups-image.m4)
 sinclude(config-scripts/cups-network.m4)
+sinclude(config-scripts/cups-poll.m4)
 sinclude(config-scripts/cups-slp.m4)
+sinclude(config-scripts/cups-gssapi.m4)
 sinclude(config-scripts/cups-ldap.m4)
 sinclude(config-scripts/cups-ssl.m4)
 sinclude(config-scripts/cups-pam.m4)
 sinclude(config-scripts/cups-threads.m4)
 sinclude(config-scripts/cups-largefile.m4)
+sinclude(config-scripts/cups-dnssd.m4)
 sinclude(config-scripts/cups-launchd.m4)
 sinclude(config-scripts/cups-defaults.m4)
 sinclude(config-scripts/cups-pap.m4)
@@ -54,26 +49,49 @@ if test "x$LANGUAGES" != x; then
        INSTALL_LANGUAGES="install-languages"
        UNINSTALL_LANGUAGES="uninstall-languages"
        for lang in $LANGUAGES; do
-               LANGFILES="$LANGFILES doc/$lang/index.html"
-               LANGFILES="$LANGFILES templates/$lang/edit-config.tmpl"
-               LANGFILES="$LANGFILES templates/$lang/header.tmpl"
+               if test -f doc/$lang/index.html.in; then
+                       LANGFILES="$LANGFILES doc/$lang/index.html"
+               fi
+
+               if test -f templates/$lang/header.tmpl.in; then
+                       LANGFILES="$LANGFILES templates/$lang/header.tmpl"
+               fi
        done
 fi
 
 AC_SUBST(INSTALL_LANGUAGES)
 AC_SUBST(UNINSTALL_LANGUAGES)
 
-AC_OUTPUT(Makedefs packaging/cups.list init/cups.sh init/cups-lpd cups-config
-         conf/cupsd.conf conf/pam.std doc/index.html
-         doc/help/standard.html man/client.conf.man
-         man/cups-deviced.man man/cups-driverd.man
-         man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man
-         man/cupsd.conf.man man/lpoptions.man
-         templates/edit-config.tmpl templates/header.tmpl
+AC_OUTPUT(Makedefs
+         conf/cupsd.conf
+         conf/mime.convs
+         conf/pam.std
+         conf/snmp.conf
+         cups-config
+         data/testprint
+         desktop/cups.desktop
+         doc/help/ref-cupsd-conf.html
+         doc/help/standard.html
+         doc/index.html
+         man/client.conf.man
+         man/cups-deviced.man
+         man/cups-driverd.man
+         man/cups-lpd.man
+         man/cupsaddsmb.man
+         man/cupsd.conf.man
+         man/cupsd.man
+         man/drv.man
+         man/lpoptions.man
+         scheduler/cups-lpd.xinetd
+         scheduler/cups.sh
+         scheduler/cups.xml
+         scheduler/org.cups.cups-lpd.plist
+         templates/header.tmpl
+          packaging/cups.list
          $LANGFILES)
 
 chmod +x cups-config
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: configure.in 7833 2008-08-04 20:55:13Z mike $".
 dnl