Fix bad merge.

[thirdparty/cups.git] / configure.in

diff --git a/configure.in b/configure.in
index 34198e412c481ec4be72d7e499d714d9e6f2ab93..d219d56fef4cf2c5fb746324c9e90a8cdc4b18dc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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,6 +56,9 @@ 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)
@@ -80,7 +82,6 @@ AC_OUTPUT(Makedefs
          man/cupsaddsmb.man
          man/cupsd.conf.man
          man/cupsd.man
-         man/drv.man
          man/lpoptions.man
          scheduler/cups-lpd.xinetd
          scheduler/cups.sh