Build system: Install individual filter executables also with universal filter

If we use the "universal" CUPS filter which runs any needed filter
chain for CUPS out of a single executable, we also install the
executables to call the individual filter function, so that PPD files
specifying filter executables (of cups-filters) in their
"*cupsFilter(2):" lines will continue to work.

Also updated the wording of the help messages for universal/individual
filter executables use in the ./configure script.

diff --git a/Makefile.am b/Makefile.am
index 279f1cc47416a64043d88e843ff0a0fb162c848f..15b71b73cefe78244cd45750b3e38995c375041c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -781,9 +781,7 @@ endif
 # ==========
 # PDF to PDF 
 # ==========
-if ENABLE_INDIVIDUAL_CUPS_FILTERS
 pkgfilter_PROGRAMS += pdftopdf
-endif
 
 pdftopdf_SOURCES = \
        filter/pdftopdf.c
@@ -801,9 +799,7 @@ pdftopdf_LDADD = \
 # ======================
 genfilterscripts = \
        filter/texttops
-if ENABLE_INDIVIDUAL_CUPS_FILTERS
 pkgfilter_SCRIPTS = $(genfilterscripts)
-endif
 if ENABLE_BRAILLE
 nodist_pkgfilter_SCRIPTS = \
        filter/braille/drivers/generic/brftoembosser \
@@ -840,7 +836,6 @@ pkgfilter_PROGRAMS += \
 endif
 endif
 endif
-if ENABLE_INDIVIDUAL_CUPS_FILTERS
 pkgfilter_PROGRAMS += \
        pdftops \
        texttopdf \
@@ -877,7 +872,6 @@ pkgfilter_PROGRAMS += \
        imagetops \
        imagetoraster
 endif
-endif
 
 check_PROGRAMS += \
        test_pdf1 \

diff --git a/configure.ac b/configure.ac
index 588bc1fe88857e08a5a509815ab5eb44043f0f42..ace8ba53ab4a87c4a02a02ea4fc0ea011657f192 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -759,7 +759,7 @@ AM_CONDITIONAL([ENABLE_RASTERTOPWG], [test "x$enable_rastertopwg" = "xyes"])
 # Check for universal CUPS filter
 # ===============================
 AC_ARG_ENABLE([universal-cups-filter],
-       [AS_HELP_STRING([--enable-universal-cups-filter], [Create single, universal CUPS filter executable for all filter functions.])],
+       [AS_HELP_STRING([--enable-universal-cups-filter], [Use a single, universal CUPS filter executable for all filter functions.])],
         [enable_universal_cups_filter="$enableval"],
         [enable_universal_cups_filter=yes]
 )
@@ -770,7 +770,7 @@ AM_CONDITIONAL([ENABLE_UNIVERSAL_CUPS_FILTER],
 # Check for individual CUPS filters
 # =================================
 AC_ARG_ENABLE([individual-cups-filters],
-       [AS_HELP_STRING([--enable-individual-cups-filters], [Create individual CUPS filter executables for each filter function.])],
+       [AS_HELP_STRING([--enable-individual-cups-filters], [Use individual CUPS filter executables for each filter function.])],
         [enable_individual_cups_filters="$enableval"],
         [enable_individual_cups_filters=no]
 )