[PATCH 21/21] Do install contrib drivers if the --disable-contrib option was chosen.

[John Darrington]

* configure.ac: Conditionally install contrib drivers.
---
 configure.ac |   33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index dcce828..0091457 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1365,18 +1365,8 @@ X11_DEVS0=""
 
 
 dnl Known printers
-HP_DEVS='cdj500 djet500 djet500c dnj650c cljet5pr deskjet laserjet ljetplus 
ljet2p ljet3 ljet3d ljet4 ljet4d lj4dith lj5mono lj5gray cdeskjet cdjcolor 
cdjmono cdj550 pj pjxl pjxl300 lp2563 paintjet pjetxl cljet5 cljet5c pxlmono 
pxlcolor cdj670 cdj850 cdj880 cdj890 cdj970 cdj1600 cdnj500 chp2200 pcl3 
hpdjplus hpdjportable hpdj310 hpdj320 hpdj340 hpdj400 hpdj500 hpdj500c hpdj510 
hpdj520 hpdj540 hpdj550c hpdj560c hpdj600 hpdj660c hpdj670c hpdj680c hpdj690c 
hpdj850c hpdj855c hpdj870c hpdj890c hpdj1120c lj3100sw'
+HP_DEVS='deskjet laserjet ljetplus ljet2p ljet3 ljet3d ljet4 ljet4d lj5mono 
lj5gray'
 PCLXL_DEVS='pxlmono pxlcolor'
-EPSON_DEVS='eps9high eps9mid epson epsonc escp lp8000 lq850 photoex st800 
stcolor alc1900 alc2000 alc4000 alc4100 alc8500 alc8600 alc9100 lp3000c lp8000c 
lp8200c lp8300c lp8500c lp8800c lp9000c lp9200c lp9500c lp9800c lps6500 epl2050 
epl2050p epl2120 epl2500 epl2750 epl5800 epl5900 epl6100 epl6200 lp1800 lp1900 
lp2200 lp2400 lp2500 lp7500 lp7700 lp7900 lp8100 lp8300f lp8400f lp8600 lp8600f 
lp8700 lp8900 lp9000b lp9100 lp9200b lp9300 lp9400 lp9600 lp9600s lps4500 
eplcolor eplmono'
-CANON_DEVS='bj10e bj200 bjc600 bjc800 lbp8 lips3 bjcmono bjcgray bjccmyk 
bjccolor'
-LEXMARK_DEVS='lxm5700m lxm3200 lex2050 lex3200 lex5700 lex7000'
-BROTHER_DEVS='hl7x0 hl1240 hl1250'
-APPLE_DEVS='appledmp iwhi iwlo iwlq'
-IBM_DEVS='ibmpro jetp3852'
-OKI_DEVS='oki182 okiibm oki4w'
-JAPAN_DEVS='lips4 lips4v ljet4pjl lj4dithp dj505j picty180 lips2p bjc880j 
pr201 pr150 pr1000 pr1000_4 jj100 bj10v bj10vh mj700v2c mj500c mj6000c mj8000c 
fmpr fmlbp ml600 lbp310 lbp320 md50Mono md50Eco md1xMono escpage lp2000 npdl 
rpdl'
-MISC_PDEVS='uniprint ap3250 atx23 atx24 atx38 coslw2p coslwxl cp50 declj250 
fs600 imagen lj250 m8510 necp6 oce9050 r4081 sj48 tek4696 t4693d2 t4693d4 
t4693d8 dl2100 la50 la70 la75 la75plus ln03 xes md2k md5k gdi samsunggdi'
-OPVP_DEVS='opvp oprp'
 
 ETS_HALFTONING_DEVS='rinkj'
 
@@ -1389,7 +1379,26 @@ JPEG_DEVS='jpeg jpeggray jpegcmyk'
 PCX_DEVS='pcxmono pcxgray pcx16 pcx256 pcx24b pcxcmyk pcx2up'
 PBM_DEVS='pbm pbmraw pgm pgmraw pgnm pgnmraw pnm pnmraw ppm ppmraw pkm pkmraw 
pksm pksmraw pam pamcmyk4 pamcmyk32 plan plang planm planc plank'
 PS_DEVS='psdf psdcmyk psdrgb pdfwrite pswrite ps2write epswrite psgray psmono 
psrgb bbox txtwrite inkcov'
-MISC_FDEVS='ccr cif inferno mag16 mag256 mgr4 mgr8 mgrgray2 mgrgray4 mgrgray8 
mgrmono miff24 plan9bm sgirgb sunhmono bit bitrgb bitrgbtags bitcmyk devicen 
spotcmyk xcf'
+MISC_FDEVS='miff24 plan9bm bit bitrgb bitrgbtags bitcmyk devicen spotcmyk xcf'
+
+
+
+if test x$enable_contrib != xno; then
+    HP_DEVS+=' cdj500 cljet5pr deskjet cdjcolor cdjmono cdj550 pj pjxl pjxl300 
lp2563 paintjet pjetxl cljet5 cljet5c pxlmono pxlcolor cdj670 cdj850 cdj880 
cdj890 cdj970 cdj1600 cdnj500 chp2200 pcl3 hpdjplus hpdjportable hpdj310 
hpdj320 hpdj340 hpdj400 hpdj500 hpdj500c hpdj510 hpdj520 hpdj540 hpdj550c 
hpdj560c hpdj600 hpdj660c hpdj670c hpdj680c hpdj690c hpdj850c hpdj855c hpdj870c 
hpdj890c hpdj1120c lj3100sw djet500 djet500c dnj650c'
+    EPSON_DEVS+=' eps9high eps9mid epson epsonc escp lp8000 lq850 photoex 
st800 stcolor'
+    CANON_DEVS+=' bj10e bj200 bjc600 bjc800 lbp8 lips3 bjcmono bjcgray bjccmyk 
bjccolor'
+    LEXMARK_DEVS+=' lxm5700m lxm3200 lex2050 lex3200 lex5700 lex7000'
+    BROTHER_DEVS+=' hl7x0 hl1240 hl1250'
+    APPLE_DEVS+=' appledmp iwhi iwlo iwlq'
+    IBM_DEVS+=' ibmpro jetp3852'
+    OKI_DEVS+=' oki182 okiibm oki4w'
+    OPVP_DEVS+=' opvp oprp'
+    JAPAN_DEVS+=' ljet4pjl lj4dithp lips2p lips4 lips4v bj10v bj10vh mj700v2c 
mj500c mj6000c mj8000c fmpr fmlbp ml600 lbp310 lbp320 md50Mono md50Eco md1xMono 
escpage lp2000 npdl rpdl bjc880j pr201 pr150 pr1000 pr1000_4 jj100 dj505j 
picty180' 
+    MISC_PDEVS+=' uniprint ap3250 atx23 atx24 atx38 coslw2p coslwxl cp50 
declj250 fs600 imagen lj250 m8510 necp6 oce9050 r4081 sj48 tek4696 t4693d2 
t4693d4 t4693d8 dl2100 la50 la70 la75 la75plus ln03 xes md2k md5k gdi 
samsunggdi'
+    EPSON_DEVS+=' alc1900 alc2000 alc4000 alc4100 alc8500 alc8600 alc9100 
lp3000c lp8000c lp8200c lp8300c lp8500c lp8800c lp9000c lp9200c lp9500c lp9800c 
lps6500 epl2050 epl2050p epl2120 epl2500 epl2750 epl5800 epl5900 epl6100 
epl6200 lp1800 lp1900 lp2200 lp2400 lp2500 lp7500 lp7700 lp7900 lp8100 lp8300f 
lp8400f lp8600 lp8600f lp8700 lp8900 lp9000b lp9100 lp9200b lp9300 lp9400 
lp9600 lp9600s lps4500 eplcolor eplmono'
+    MISC_FDEVS+=' ccr cif inferno mag16 mag256 mgr4 mgr8 mgrgray2 mgrgray4 
mgrgray8 mgrmono sgirgb sunhmono'
+fi
+
 SVGDEV='svgwrite'
 
 while test -n "$drivers"; do
-- 
1.7.10.4