Fix bad merge.

[thirdparty/cups.git] / configure.in

diff --git a/configure.in b/configure.in
index ec142509d528cf77f3da253b6aa79aada4017d40..d219d56fef4cf2c5fb746324c9e90a8cdc4b18dc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: configure.in 6717 2007-07-24 23:47:12Z mike $"
+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 2007 by Apple Inc.
+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
@@ -31,14 +31,13 @@ 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)
 
@@ -57,23 +56,43 @@ if test "x$LANGUAGES" != x; then
                        LANGFILES="$LANGFILES templates/$lang/header.tmpl"
                fi
        done
+elif test "x$CUPS_BUNDLEDIR" != ""; then
+       INSTALL_LANGUAGES="install-langbundle"
+       UNINSTALL_LANGUAGES="uninstall-langbundle"
 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/mime.convs conf/pam.std conf/snmp.conf
-         doc/index.html doc/help/ref-cupsd-conf.html doc/help/standard.html
-         init/org.cups.cups-lpd.plist
-         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/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/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: configure.in 6717 2007-07-24 23:47:12Z mike $".
+dnl End of "$Id: configure.in 7833 2008-08-04 20:55:13Z mike $".
 dnl