X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=configure.in;h=6e3977bea90ef61a772b85c613fffe8140949759;hb=12f89d241ce15358fb71ef1b1249803ee9d97374;hp=bc0619516cc26d9855f802326ccbbefd1eb0b934;hpb=b19ccc9e271691cc71a08e9968c58f464ebeade5;p=thirdparty%2Fcups.git

diff --git a/configure.in b/configure.in
index bc0619516..6e3977bea 100644
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
 dnl
 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-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,20 +51,39 @@ 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 packaging/cups.list init/cups.sh init/cups-lpd cups-config
-	  conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf
+AC_OUTPUT(Makedefs
+	  conf/cupsd.conf
+	  conf/mime.convs
+	  conf/pam.std
+	  conf/snmp.conf
+	  cups-config
+	  data/testprint
 	  desktop/cups.desktop
-	  doc/index.html doc/help/ref-cupsd-conf.html doc/help/standard.html
-	  init/org.cups.cups-lpd.plist init/cups.xml
-	  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/drv.man man/lpoptions.man
-	  templates/header.tmpl
+	  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