[gs-commits] rev 12298 - trunk/gs/base
chrisl at ghostscript.com
chrisl at ghostscript.com
Thu Mar 17 09:41:16 UTC 2011
Author: chrisl
Date: 2011-03-17 09:41:16 +0000 (Thu, 17 Mar 2011)
New Revision: 12298
Modified:
trunk/gs/base/configure.ac
Log:
Fix some issue where user specified devices didn't get the requisite "$(DD)"
and ".dev" runes added to them.
Also, rearrange the "pre-declared" device strings to be more consistent within
configure.ac
Bug 692062
No cluster differences expected.
Modified: trunk/gs/base/configure.ac
===================================================================
--- trunk/gs/base/configure.ac 2011-03-16 18:03:15 UTC (rev 12297)
+++ trunk/gs/base/configure.ac 2011-03-17 09:41:16 UTC (rev 12298)
@@ -332,7 +332,7 @@
fi
;;
no)
- AC_CHECK_FUNC(iconv_open, [with_libiconv=no; found_iconv=yes])
+ found_iconv=no
;;
gnu|yes)
AC_CHECK_LIB(iconv, libiconv_open, [with_libiconv=gnu; found_iconv=yes])
@@ -614,7 +614,7 @@
dnl png for the png output device; it also requires zlib
LIBPNGDIR=src
PNGDEVS=''
-PNGDEVS_ALL='$(DD)png48.dev $(DD)png16m.dev $(DD)pnggray.dev $(DD)pngmono.dev $(DD)png256.dev $(DD)png16.dev $(DD)pngalpha.dev'
+PNGDEVS_ALL='png48 png16m pnggray pngmono png256 png16 pngalpha'
AC_MSG_CHECKING([for local png library source])
if test -f libpng/pngread.c; then
AC_MSG_RESULT([yes])
@@ -764,7 +764,7 @@
CUPSSERVERBIN="`$CUPSCONFIG --serverbin`"
CUPSDATA="`$CUPSCONFIG --datadir`"
CUPSINCLUDE="include cups/cups.mak"
- CUPSDEV="\$(DD)cups.dev"
+ CUPSDEV="cups"
CUPSVERSION="`$CUPSCONFIG --version`"
LCUPSINCLUDE="include \$(GLSRCDIR)/lcups.mak"
LCUPSIINCLUDE="include \$(GLSRCDIR)/lcupsi.mak"
@@ -782,7 +782,7 @@
LCUPSBUILDTYPE=linux
LCUPSINCLUDE="include \$(GLSRCDIR)/lcups.mak"
LCUPSIINCLUDE="include \$(GLSRCDIR)/lcupsi.mak"
- CUPSDEV="\$(DD)cups.dev"
+ CUPSDEV="cups"
fi
fi
@@ -819,7 +819,7 @@
if test -d ijs; then
AC_MSG_RESULT([yes])
IJSDIR=ijs
- IJSDEVS='$(DD)ijs.dev'
+ IJSDEVS='ijs'
else
AC_MSG_RESULT([no])
AC_CHECK_LIB(ijs, ijs_server_init, [
@@ -829,7 +829,7 @@
IJSLIB=ijs
# This is for safety - it prevents our header search path going outside the GS source tree
IJSDIR='$(GLOBJDIR)'
- IJSDEVS='$(DD)ijs.dev'
+ IJSDEVS='ijs'
fi
fi
fi
@@ -1051,7 +1051,7 @@
LIBS="$SAVELIBS"
if test "$ac_cv_lib_Xt_XtAppCreateShell" = yes; then
- X11DEVS="\$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11mono.dev \$(DD)x11_.dev \$(DD)x11alt_.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev"
+ X11DEVS="x11 x11alpha x11cmyk x11mono x11_ x11alt_ x11cmyk2 x11cmyk4 x11cmyk8 x11rg16x x11rg32x x11gray2 x11gray4"
X_DEVS=$X11DEVS
# the makefile wants a list of just the library names in X_LIBS
GS_SPLIT_LIBS([X_LIBS],
@@ -1127,45 +1127,45 @@
fi
dnl Check which drivers we'd like to support.
-P_DEVS=""
-F_DEVS=""
+P_DEVS0=""
+F_DEVS0=""
+CUPS_DEVS0=""
+SVG_DEVS0=""
+JBIG2_DEVS=""
+IJS_DEVS0=""
+PNG_DEVS0=""
+X11_DEVS0=""
+
dnl Known printers
-HP_DEVS='$(DD)cdj500.dev $(DD)djet500.dev $(DD)djet500c.dev $(DD)dnj650c.dev $(DD)cljet5pr.dev $(DD)deskjet.dev $(DD)laserjet.dev $(DD)ljetplus.dev $(DD)ljet2p.dev $(DD)ljet3.dev $(DD)ljet3d.dev $(DD)ljet4.dev $(DD)ljet4d.dev $(DD)lj4dith.dev $(DD)lj5mono.dev $(DD)lj5gray.dev $(DD)cdeskjet.dev $(DD)cdjcolor.dev $(DD)cdjmono.dev $(DD)cdj550.dev $(DD)pj.dev $(DD)pjxl.dev $(DD)pjxl300.dev $(DD)lp2563.dev $(DD)paintjet.dev $(DD)pjetxl.dev $(DD)cljet5.dev $(DD)cljet5c.dev $(DD)pxlmono.dev $(DD)pxlcolor.dev $(DD)cdj670.dev $(DD)cdj850.dev $(DD)cdj880.dev $(DD)cdj890.dev $(DD)cdj970.dev $(DD)cdj1600.dev $(DD)cdnj500.dev $(DD)chp2200.dev $(DD)pcl3.dev $(DD)hpdjplus.dev $(DD)hpdjportable.dev $(DD)hpdj310.dev $(DD)hpdj320.dev $(DD)hpdj340.dev $(DD)hpdj400.dev $(DD)hpdj500.dev $(DD)hpdj500c.dev $(DD)hpdj510.dev $(DD)hpdj520.dev $(DD)hpdj540.dev $(DD)hpdj550c.dev $(DD)hpdj560c.dev $(DD)hpdj600.dev $(DD)hpdj660c.dev $(DD)hpdj670c.dev $(DD)hpdj680c.dev $(DD)hpdj690c.dev $(DD)hpdj850c.dev $(DD)hpdj855c.dev $(DD)hpdj870c.dev $(DD)hpdj890c.dev $(DD)hpdj1120c.dev $(DD)lj3100sw.dev'
-PCLXL_DEVS='$(DD)pxlmono.dev $(DD)pxlcolor.dev'
-EPSON_DEVS='$(DD)eps9high.dev $(DD)eps9mid.dev $(DD)epson.dev $(DD)epsonc.dev $(DD)escp.dev $(DD)lp8000.dev $(DD)lq850.dev $(DD)photoex.dev $(DD)st800.dev $(DD)stcolor.dev $(DD)alc1900.dev $(DD)alc2000.dev $(DD)alc4000.dev $(DD)alc4100.dev $(DD)alc8500.dev $(DD)alc8600.dev $(DD)alc9100.dev $(DD)lp3000c.dev $(DD)lp8000c.dev $(DD)lp8200c.dev $(DD)lp8300c.dev $(DD)lp8500c.dev $(DD)lp8800c.dev $(DD)lp9000c.dev $(DD)lp9200c.dev $(DD)lp9500c.dev $(DD)lp9800c.dev $(DD)lps6500.dev $(DD)epl2050.dev $(DD)epl2050p.dev $(DD)epl2120.dev $(DD)epl2500.dev $(DD)epl2750.dev $(DD)epl5800.dev $(DD)epl5900.dev $(DD)epl6100.dev $(DD)epl6200.dev $(DD)lp1800.dev $(DD)lp1900.dev $(DD)lp2200.dev $(DD)lp2400.dev $(DD)lp2500.dev $(DD)lp7500.dev $(DD)lp7700.dev $(DD)lp7900.dev $(DD)lp8100.dev $(DD)lp8300f.dev $(DD)lp8400f.dev $(DD)lp8600.dev $(DD)lp8600f.dev $(DD)lp8700.dev $(DD)lp8900.dev $(DD)lp9000b.dev $(DD)lp9100.dev $(DD)lp9200b.dev $(DD)lp9300.dev $(DD)lp9400.dev $(DD)lp9600.dev $(DD)lp9600s.dev $(DD)lps4500.dev $(DD)eplcolor.dev $(DD)eplmono.dev'
-CANON_DEVS='$(DD)bj10e.dev $(DD)bj200.dev $(DD)bjc600.dev $(DD)bjc800.dev $(DD)lbp8.dev $(DD)lips3.dev $(DD)bjcmono.dev $(DD)bjcgray.dev $(DD)bjccmyk.dev $(DD)bjccolor.dev'
-LEXMARK_DEVS='$(DD)lxm5700m.dev $(DD)lx5000.dev $(DD)lxm3200.dev $(DD)lex2050.dev $(DD)lex3200.dev $(DD)lex5700.dev $(DD)lex7000.dev'
-BROTHER_DEVS='$(DD)hl7x0.dev $(DD)hl1240.dev $(DD)hl1250.dev'
-APPLE_DEVS='$(DD)appledmp.dev $(DD)iwhi.dev $(DD)iwlo.dev $(DD)iwlq.dev'
-IBM_DEVS='$(DD)ibmpro.dev $(DD)jetp3852.dev'
-OKI_DEVS='$(DD)oki182.dev $(DD)okiibm.dev $(DD)oki4w.dev'
-JAPAN_DEVS='$(DD)lips4.dev $(DD)lips4v.dev $(DD)ljet4pjl.dev $(DD)lj4dithp.dev $(DD)dj505j.dev $(DD)picty180.dev $(DD)lips2p.dev $(DD)bjc880j.dev $(DD)pr201.dev $(DD)pr150.dev $(DD)pr1000.dev $(DD)pr1000_4.dev $(DD)jj100.dev $(DD)bj10v.dev $(DD)bj10vh.dev $(DD)mj700v2c.dev $(DD)mj500c.dev $(DD)mj6000c.dev $(DD)mj8000c.dev $(DD)fmpr.dev $(DD)fmlbp.dev $(DD)ml600.dev $(DD)lbp310.dev $(DD)lbp320.dev $(DD)md50Mono.dev $(DD)md50Eco.dev $(DD)md1xMono.dev $(DD)escpage.dev $(DD)lp2000.dev $(DD)npdl.dev $(DD)rpdl.dev'
-MISC_PDEVS='$(DD)uniprint.dev $(DD)ap3250.dev $(DD)atx23.dev $(DD)atx24.dev $(DD)atx38.dev $(DD)coslw2p.dev $(DD)coslwxl.dev $(DD)cp50.dev $(DD)declj250.dev $(DD)fs600.dev $(DD)imagen.dev $(DD)lj250.dev $(DD)m8510.dev $(DD)necp6.dev $(DD)oce9050.dev $(DD)r4081.dev $(DD)sj48.dev $(DD)tek4696.dev $(DD)t4693d2.dev $(DD)t4693d4.dev $(DD)t4693d8.dev $(DD)dl2100.dev $(DD)la50.dev $(DD)la70.dev $(DD)la75.dev $(DD)la75plus.dev $(DD)ln03.dev $(DD)xes.dev $(DD)md2k.dev $(DD)md5k.dev $(DD)gdi.dev $(DD)samsunggdi.dev'
-OPVP_DEVS='$(DD)opvp.dev $(DD)oprp.dev'
+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'
+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 lx5000 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='$(DD)rinkj.dev'
+ETS_HALFTONING_DEVS='rinkj'
dnl Known file formats
-BMP_DEVS='$(DD)bmpmono.dev $(DD)bmpgray.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16.dev $(DD)bmp256.dev $(DD)bmp16m.dev $(DD)bmp32b.dev'
-FAX_DEVS='$(DD)cfax.dev $(DD)dfaxlow.dev $(DD)dfaxhigh.dev $(DD)fax.dev $(DD)tfax.dev $(DD)tiffg3.dev $(DD)tiffg32d.dev $(DD)tiffg4.dev $(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev'
-JPEG_DEVS='$(DD)jpeg.dev $(DD)jpeggray.dev $(DD)jpegcmyk.dev'
-# PNG_DEVS='png16.dev $(DD)png16m.dev $(DD)png256.dev $(DD)pngalpha.dev $(DD)pnggray.dev $(DD)pngmono.dev'
-TIFF_DEVS='$(DD)tiffs.dev $(DD)tiff12nc.dev $(DD)tiff24nc.dev $(DD)tiff48nc.dev $(DD)tiff32nc.dev $(DD)tiff64nc.dev $(DD)tiffcrle.dev $(DD)tifflzw.dev $(DD)tiffpack.dev $(DD)tiffgray.dev $(DD)tiffsep.dev $(DD)tiffsep1.dev $(DD)tiffscaled.dev'
-PCX_DEVS='$(DD)pcxmono.dev $(DD)pcxgray.dev $(DD)pcx16.dev $(DD)pcx256.dev $(DD)pcx24b.dev $(DD)pcxcmyk.dev $(DD)pcx2up.dev'
-PBM_DEVS='$(DD)pbm.dev $(DD)pbmraw.dev $(DD)pgm.dev $(DD)pgmraw.dev $(DD)pgnm.dev $(DD)pgnmraw.dev $(DD)pnm.dev $(DD)pnmraw.dev $(DD)ppm.dev $(DD)ppmraw.dev $(DD)pkm.dev $(DD)pkmraw.dev $(DD)pksm.dev $(DD)pksmraw.dev $(DD)pam.dev'
-PS_DEVS='$(DD)psdf.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev $(DD)pdfwrite.dev $(DD)pswrite.dev $(DD)ps2write.dev $(DD)epswrite.dev $(DD)psgray.dev $(DD)psmono.dev $(DD)psrgb.dev $(DD)bbox.dev'
-WTS_HALFTONING_DEVS='$(DD)imdi.dev $(DD)simdi.dev $(DD)wtsimdi.dev $(DD)wtscmyk.dev'
-MISC_FDEVS='$(DD)ccr.dev $(DD)cgm24.dev $(DD)cgm8.dev $(DD)cgmmono.dev $(DD)cif.dev $(DD)inferno.dev $(DD)mag16.dev $(DD)mag256.dev $(DD)mgr4.dev $(DD)mgr8.dev $(DD)mgrgray2.dev $(DD)mgrgray4.dev $(DD)mgrgray8.dev $(DD)mgrmono.dev $(DD)miff24.dev $(DD)plan9bm.dev $(DD)sgirgb.dev $(DD)sunhmono.dev $(DD)bit.dev $(DD)bitrgb.dev $(DD)bitrgbtags.dev $(DD)bitcmyk.dev $(DD)devicen.dev $(DD)spotcmyk.dev $(DD)xcf.dev'
-SVGDEV='$(DD)svgwrite.dev'
+BMP_DEVS='bmpmono bmpgray bmpsep1 bmpsep8 bmp16 bmp256 bmp16m bmp32b'
+FAX_DEVS='cfax dfaxlow dfaxhigh fax tfax tiffg3 tiffg32d tiffg4 faxg3 faxg32d faxg4'
+JPEG_DEVS='jpeg jpeggray jpegcmyk'
+# PNG_DEVS='png16 png16m png256 pngalpha pnggray pngmono'
+TIFF_DEVS='tiffs tiff12nc tiff24nc tiff48nc tiff32nc tiff64nc tiffcrle tifflzw tiffpack tiffgray tiffsep tiffsep1 tiffscaled'
+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'
+PS_DEVS='psdf psdcmyk psdrgb pdfwrite pswrite ps2write epswrite psgray psmono psrgb bbox'
+WTS_HALFTONING_DEVS='imdi simdi wtsimdi wtscmyk'
+MISC_FDEVS='ccr cgm24 cgm8 cgmmono cif inferno mag16 mag256 mgr4 mgr8 mgrgray2 mgrgray4 mgrgray8 mgrmono miff24 plan9bm sgirgb sunhmono bit bitrgb bitrgbtags bitcmyk devicen spotcmyk xcf'
+SVGDEV='svgwrite'
-CUPS_DEVS=""
-SVG_DEVS=""
-JBIG2_DEVS=""
-IJS_DEVS=""
-PNG_DEVS=""
-X11_DEVS=""
-
while test -n "$drivers"; do
if echo $drivers |grep "," >/dev/null; then
THIS="`echo $drivers |sed -e 's/,.*//'`"
@@ -1184,38 +1184,38 @@
fi
;;
PRINTERS)
- P_DEVS="$P_DEVS $CANON_DEVS $EPSON_DEVS $HP_DEVS $LEXMARK_DEVS $BROTHER_DEVS $APPLE_DEVS $IBM_DEVS $OKI_DEVS $JAPAN_DEVS $MISC_PDEVS $ETS_HALFTONING_DEVS $OPVP_DEVS"
- IJS_DEVS="$IJSDEVS"
+ P_DEVS0="$P_DEVS0 $CANON_DEVS $EPSON_DEVS $HP_DEVS $LEXMARK_DEVS $BROTHER_DEVS $APPLE_DEVS $IBM_DEVS $OKI_DEVS $JAPAN_DEVS $MISC_PDEVS $ETS_HALFTONING_DEVS $OPVP_DEVS"
+ IJS_DEVS0="$IJSDEVS"
;;
FILES)
- F_DEVS="$F_DEVS $BMP_DEVS $FAX_DEVS $JPEG_DEVS $TIFF_DEVS $PCX_DEVS $PBM_DEVS $PS_DEVS $WTS_HALFTONING_DEVS $MISC_FDEVS"
- CUPS_DEVS="$CUPSDEV"
+ F_DEVS0="$F_DEVS0 $BMP_DEVS $FAX_DEVS $JPEG_DEVS $TIFF_DEVS $PCX_DEVS $PBM_DEVS $PS_DEVS $WTS_HALFTONING_DEVS $MISC_FDEVS"
+ CUPS_DEVS0="$CUPSDEV"
JBIG2_DEVS="$JBIG2DEVS"
- PNG_DEVS="$PNGDEVS"
+ PNG_DEVS0="$PNGDEVS"
;;
APPLE)
# All Apple printers
- P_DEVS="$P_DEVS $APPLE_DEVS"
+ P_DEVS0="$P_DEVS0 $APPLE_DEVS"
;;
BMP)
# BMP file format
- F_DEVS="$F_DEVS $BMP_DEVS"
+ F_DEVS0="$F_DEVS0 $BMP_DEVS"
;;
CANON)
# All Canon printers
- P_DEVS="$P_DEVS $CANON_DEVS"
+ P_DEVS0="$P_DEVS0 $CANON_DEVS"
;;
EPSON)
# All Epson printers
- P_DEVS="$P_DEVS $EPSON_DEVS"
+ P_DEVS0="$P_DEVS0 $EPSON_DEVS"
;;
FAX)
# Fax file formats
- F_DEVS="$F_DEVS $FAX_DEVS"
+ F_DEVS0="$F_DEVS0 $FAX_DEVS"
;;
JPEG)
# Jpeg file formats
- F_DEVS="$F_DEVS $JPEG_DEVS"
+ F_DEVS0="$F_DEVS0 $JPEG_DEVS"
;;
JBIG2)
# JBIG file formats
@@ -1223,105 +1223,128 @@
;;
PNG)
# PNG file formats
- PNG_DEVS="$PNGDEVS"
+ PNG_DEVS0="$PNGDEVS"
;;
TIFF)
# TIFF file formats
- F_DEVS="$F_DEVS $TIFF_DEVS"
+ F_DEVS0="$F_DEVS0 $TIFF_DEVS"
;;
PCLXL)
# PCL XL/PCL 6 drivers
- F_DEVS="$F_DEVS $PCLXL_DEVS"
+ F_DEVS0="$F_DEVS0 $PCLXL_DEVS"
;;
PCX)
# PCX file formats
- F_DEVS="$F_DEVS $PCX_DEVS"
+ F_DEVS0="$F_DEVS0 $PCX_DEVS"
;;
PBM)
# PBM file formats
- F_DEVS="$F_DEVS $PBM_DEVS"
+ F_DEVS0="$F_DEVS0 $PBM_DEVS"
;;
CUPS)
# CUPS file format
- CUPS_DEVS="$CUPSDEV"
+ CUPS_DEVS0="$CUPSDEV"
;;
HP)
# All HP printers
- P_DEVS="$P_DEVS $HP_DEVS"
+ P_DEVS0="$P_DEVS0 $HP_DEVS"
;;
LEXMARK)
# All Lexmark printers
- P_DEVS="$P_DEVS $LEXMARK_DEVS"
+ P_DEVS0="$P_DEVS0 $LEXMARK_DEVS"
;;
BROTHER)
# All Brother printers
- P_DEVS="$P_DEVS $BROTHER_DEVS"
+ P_DEVS0="$P_DEVS0 $BROTHER_DEVS"
;;
OKI)
# All OKI printers
- P_DEVS="$P_DEVS $OKI_DEVS"
+ P_DEVS0="$P_DEVS0 $OKI_DEVS"
;;
IBM)
# All IBM printers
- P_DEVS="$P_DEVS $IBM_DEVS"
+ P_DEVS0="$P_DEVS0 $IBM_DEVS"
;;
IJS)
# IJS printers
- IJS_DEVS="$IJSDEVS"
+ IJS_DEVS0="$IJSDEVS"
;;
JAPAN)
# All old japanese printers
- P_DEVS="$P_DEVS $JAPAN_DEVS"
+ P_DEVS0="$P_DEVS0 $JAPAN_DEVS"
;;
PS)
# PostScript/PDF writing
- F_DEVS="$F_DEVS $SVG_DEVS"
+ F_DEVS0="$F_DEVS0 $PS_DEVS"
;;
SVG)
# PostScript/PDF writing
- SVG_DEVS="$SVGDEV"
+ SVG_DEVS0="$SVGDEV"
;;
WTS)
# WTS Halftoning devices
- F_DEVS="$F_DEVS $WTS_HALFTONING_DEVS"
+ F_DEVS0="$F_DEVS0 $WTS_HALFTONING_DEVS"
;;
ETS)
# ETS Halftoning devices
- F_DEVS="$F_DEVS $ETS_HALFTONING_DEVS"
+ F_DEVS0="$F_DEVS0 $ETS_HALFTONING_DEVS"
;;
X11)
# X11 display devices
- X11_DEVS="$X_DEVS"
+ X11_DEVS0="$X_DEVS"
;;
opvp)
# Open Vector Printing driver...
if test x$ac_cv_lib_dl_dlopen != xno -a x$found_iconv != xno; then
- P_DEVS="$P_DEVS $OPVP_DEVS"
+ P_DEVS0="$P_DEVS0 $OPVP_DEVS"
else
- AC_MSG_WARN(Unable to include opvp/oprp driver due to missing prerequisites...)
+ AC_MSG_WARN(Unable to include opvp/oprp driver due to missing or disabled prerequisites...)
fi
;;
*)
# It's a driver name (or a user messup)
- P_DEVS="$P_DEVS `echo $THIS |sed -e 's,\.dev$,,'`"
+ P_DEVS0="$P_DEVS0 `echo $THIS |sed -e 's,\.dev$,,'`"
;;
esac
done
+
+noncontribmakefiles=`find . -name '*.mak' -print | grep -v '^\./contrib/'`
# No need to include opvp/oprp driver without iconv/libiconv.
-if test -n "$P_DEVS"; then
+if test -n "$P_DEVS0"; then
if test x$found_iconv = xno ; then
- P_DEVS=`echo $P_DEVS | sed -e 's|$(DD)opvp.dev||' -e 's|$(DD)oprp.dev||'`
+ P_DEVS0=`echo $P_DEVS0 | sed -e 's|opvp||' -e 's|oprp||'`
AC_MSG_WARN(Unable to include opvp/oprp driver due to missing iconv/libiconv...)
fi
# Remove contributed drivers if requested and make sure we don't have any
# duplicates in there, add $(DD)foo.dev constructs
- noncontribmakefiles=`find . -name '*.mak' -print | grep -v '^\./contrib/'`
- PRINTERS=`(for i in $P_DEVS; do d='$(DD)'${i}.dev; if ( grep '^'$d $noncontribmakefiles 2>&1 >/dev/null ) || ( ! test -z "$CONTRIBINCLUDE" ); then echo $d; fi; done) | sort | uniq | tr '\012' ' '`
+ P_DEVS=`(for i in $P_DEVS0; do d='$(DD)'${i}.dev; if ( grep '^'$d $noncontribmakefiles 2>&1 >/dev/null ) || ( ! test -z "$CONTRIBINCLUDE" ); then echo $d; fi; done) | sort | uniq | tr '\012' ' '`
fi
-if test -n "$F_DEVS"; then
- FILES=`(for i in $F_DEVS; do d='$(DD)'${i}.dev; if ( grep '^'$d $noncontribmakefiles 2>&1 >/dev/null) || ( ! test -z "$CONTRIBINCLUDE" ); then echo $d; fi; done) | sort | uniq | tr '\012' ' '`
+
+if test -n "$F_DEVS0"; then
+ F_DEVS=`(for i in $F_DEVS0; do d='$(DD)'${i}.dev; if ( grep '^'$d $noncontribmakefiles 2>&1 >/dev/null) || ( ! test -z "$CONTRIBINCLUDE" ); then echo $d; fi; done) | sort | uniq | tr '\012' ' '`
fi
+
+if test -n "$CUPS_DEVS0"; then
+ CUPS_DEVS=`(for i in $CUPS_DEVS0; do d='$(DD)'${i}.dev; if ( grep '^'$d $noncontribmakefiles 2>&1 >/dev/null) || ( ! test -z "$CONTRIBINCLUDE" ); then echo $d; fi; done) | sort | uniq | tr '\012' ' '`
+fi
+
+if test -n "$SVG_DEVS0"; then
+ SVG_DEVS=`(for i in $SVG_DEVS0; do d='$(DD)'${i}.dev; if ( grep '^'$d $noncontribmakefiles 2>&1 >/dev/null) || ( ! test -z "$CONTRIBINCLUDE" ); then echo $d; fi; done) | sort | uniq | tr '\012' ' '`
+fi
+
+if test -n "$IJS_DEVS0"; then
+ IJS_DEVS=`(for i in $IJS_DEVS0; do d='$(DD)'${i}.dev; if ( grep '^'$d $noncontribmakefiles 2>&1 >/dev/null) || ( ! test -z "$CONTRIBINCLUDE" ); then echo $d; fi; done) | sort | uniq | tr '\012' ' '`
+fi
+
+if test -n "$PNG_DEVS0"; then
+ PNG_DEVS=`(for i in $PNG_DEVS0; do d='$(DD)'${i}.dev; if ( grep '^'$d $noncontribmakefiles 2>&1 >/dev/null) || ( ! test -z "$CONTRIBINCLUDE" ); then echo $d; fi; done) | sort | uniq | tr '\012' ' '`
+fi
+
+if test -n "$X11_DEVS0"; then
+ X11_DEVS=`(for i in $X11_DEVS0; do d='$(DD)'${i}.dev; if ( grep '^'$d $noncontribmakefiles 2>&1 >/dev/null) || ( ! test -z "$CONTRIBINCLUDE" ); then echo $d; fi; done) | sort | uniq | tr '\012' ' '`
+fi
+
AC_SUBST(P_DEVS)
AC_SUBST(F_DEVS)
AC_SUBST(CUPS_DEVS)
More information about the gs-commits
mailing list