Changelog.

[thirdparty/cups.git] / configure.in

diff --git a/configure.in b/configure.in
index 57be21356bdc348c7259ceb2c046cfd16b4b88be..fd0e079db5a23dbac2db5ae0fbab5488fe22b611 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl "$Id$"
 dnl
 dnl   Configuration script for CUPS.
 dnl
-dnl   Copyright 2007-2010 by Apple Inc.
+dnl   Copyright 2007-2012 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
@@ -20,26 +20,20 @@ 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-threads.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)
-sinclude(config-scripts/cups-pdf.m4)
 sinclude(config-scripts/cups-scripting.m4)
 
 INSTALL_LANGUAGES=""
@@ -57,12 +51,16 @@ if test "x$LANGUAGES" != x; then
                        LANGFILES="$LANGFILES templates/$lang/header.tmpl"
                fi
        done
+elif test "x$CUPS_BUNDLEDIR" != x; then
+       INSTALL_LANGUAGES="install-langbundle"
+       UNINSTALL_LANGUAGES="uninstall-langbundle"
 fi
 
 AC_SUBST(INSTALL_LANGUAGES)
 AC_SUBST(UNINSTALL_LANGUAGES)
 
 AC_OUTPUT(Makedefs
+         conf/cups-files.conf
          conf/cupsd.conf
          conf/mime.convs
          conf/pam.std
@@ -70,17 +68,19 @@ AC_OUTPUT(Makedefs
          cups-config
          data/testprint
          desktop/cups.desktop
+         doc/help/ref-cups-files-conf.html
          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-files.conf.man
          man/cups-lpd.man
+         man/cups-snmp.man
          man/cupsaddsmb.man
          man/cupsd.conf.man
          man/cupsd.man
-         man/drv.man
          man/lpoptions.man
          scheduler/cups-lpd.xinetd
          scheduler/cups.sh