Renamed backend configuration files from *.conf to *.conf.in. The configuration

files are preprocessed by backend/Makefile now and variables like @DATADIR@ are
substituted by the appropriate directories. This is especially useful for
firmware locations. For the firmware paths for the artec_eplus48u, gt68xx, and
snapscan backends variables were used. Bug #302590.

ChangeLog

@@ -1,3 +1,61 @@
+2006-01-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
+
+	* backend/Makefile.in backend/abaton.conf backend/abaton.conf.in
+	  backend/agfafocus.conf backend/agfafocus.conf.in
+	  backend/apple.conf backend/apple.conf.in backend/artec.conf
+	  backend/artec.conf.in backend/artec_eplus48u.conf
+	  backend/artec_eplus48u.conf.in backend/avision.conf
+	  backend/avision.conf.in backend/bh.conf backend/bh.conf.in
+	  backend/canon.conf backend/canon.conf.in backend/canon630u.conf
+	  backend/canon630u.conf.in backend/canon_pp.conf
+	  backend/canon_pp.conf.in backend/coolscan.conf
+	  backend/coolscan.conf.in backend/coolscan2.conf
+	  backend/coolscan2.conf.in backend/dc210.conf
+	  backend/dc210.conf.in backend/dc240.conf backend/dc240.conf.in
+	  backend/dc25.conf backend/dc25.conf.in backend/dll.conf
+	  backend/dll.conf.in backend/dmc.conf backend/dmc.conf.in
+	  backend/epson.conf backend/epson.conf.in backend/fujitsu.conf
+	  backend/fujitsu.conf.in backend/genesys.conf
+	  backend/genesys.conf.in backend/gphoto2.conf
+	  backend/gphoto2.conf.in backend/gt68xx.conf
+	  backend/gt68xx.conf.in backend/hp.conf backend/hp.conf.in
+	  backend/hp4200.conf backend/hp4200.conf.in backend/hp5400.conf
+	  backend/hp5400.conf.in backend/hpsj5s.conf
+	  backend/hpsj5s.conf.in backend/ibm.conf backend/ibm.conf.in
+	  backend/leo.conf backend/leo.conf.in backend/lexmark.conf
+	  backend/lexmark.conf.in backend/ma1509.conf
+	  backend/ma1509.conf.in backend/matsushita.conf
+	  backend/matsushita.conf.in backend/microtek.conf
+	  backend/microtek.conf.in backend/microtek2.conf
+	  backend/microtek2.conf.in backend/mustek.conf
+	  backend/mustek.conf.in backend/mustek_pp.conf
+	  backend/mustek_pp.conf.in backend/mustek_usb.conf
+	  backend/mustek_usb.conf.in backend/nec.conf backend/nec.conf.in
+	  backend/net.conf backend/net.conf.in backend/pie.conf
+	  backend/pie.conf.in backend/plustek.conf backend/plustek.conf.in
+	  backend/plustek_pp.conf backend/plustek_pp.conf.in
+	  backend/qcam.conf backend/qcam.conf.in backend/ricoh.conf
+	  backend/ricoh.conf.in backend/s9036.conf backend/s9036.conf.in
+	  backend/saned.conf backend/saned.conf.in backend/sceptre.conf
+	  backend/sceptre.conf.in backend/sharp.conf backend/sharp.conf.in
+	  backend/sm3840.conf backend/sm3840.conf.in backend/snapscan.conf
+	  backend/snapscan.conf.in backend/sp15c.conf
+	  backend/sp15c.conf.in backend/st400.conf backend/st400.conf.in
+	  backend/tamarack.conf backend/tamarack.conf.in
+	  backend/teco1.conf backend/teco1.conf.in backend/teco2.conf
+	  backend/teco2.conf.in backend/teco3.conf backend/teco3.conf.in
+	  backend/test.conf backend/test.conf.in backend/u12.conf
+	  backend/u12.conf.in backend/umax.conf backend/umax.conf.in
+	  backend/umax1220u.conf backend/umax1220u.conf.in
+	  backend/umax_pp.conf backend/umax_pp.conf.in backend/v4l.conf
+	  backend/v4l.conf.in:
+	  Renamed backend configuration files from *.conf to
+	  *.conf.in. The configuration files are preprocessed by
+	  backend/Makefile now and variables like @DATADIR@ are substituted
+	  by the appropriate directories. This is especially useful for
+	  firmware locations. For the firmware paths for the artec_eplus48u,
+	  gt68xx, and snapscan backends variables were used. Bug #302590.
+
 2006-01-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
 
 	* doc/sane.tex: Corrected formula for calculation of

backend/Makefile.in

@@ -7,6 +7,7 @@ top_builddir = ..
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
+package_version = @PACKAGE_STRING@
 distdir = $(top_srcdir)/$(PACKAGE)-$(VERSION)
 
 prefix = @prefix@
@@ -85,57 +86,57 @@ endif
 
 LIBOBJS = $(addprefix ../lib/,$(addsuffix .lo,$(LIBLIB_FUNCS)))
 
-DISTFILES = abaton.c abaton.conf abaton.h agfafocus.c agfafocus.conf \
-  agfafocus.h apple.c apple.conf apple.h artec.c artec.conf artec.h \
-  artec_eplus48u.c artec_eplus48u.h artec_eplus48u.conf as6e.c \
-  as6e.h avision.c avision.conf avision.h bh.c bh.conf bh.h canon.c \
-  canon.conf canon.h canon-sane.c canon-scsi.c canon630u.c canon630u-common.c \
-  canon630u.conf canon_pp.conf canon_pp.h canon_pp.c canon_pp-dev.c \
+DISTFILES = abaton.c abaton.conf.in abaton.h agfafocus.c agfafocus.conf.in \
+  agfafocus.h apple.c apple.conf.in apple.h artec.c artec.conf.in artec.h \
+  artec_eplus48u.c artec_eplus48u.h artec_eplus48u.conf.in as6e.c \
+  as6e.h avision.c avision.conf.in avision.h bh.c bh.conf.in bh.h canon.c \
+  canon.conf.in canon.h canon-sane.c canon-scsi.c canon630u.c canon630u-common.c \
+  canon630u.conf.in canon_pp.conf.in canon_pp.h canon_pp.c canon_pp-dev.c \
   canon_pp-dev.h canon_pp-io.c canon_pp-io.h coolscan.c \
-  coolscan.conf coolscan.h coolscan-scsidef.h coolscan2.c coolscan2.conf \
-  dc210.c dc210.conf dc210.h \
-  dc240.c dc240.conf dc240.h dc25.c dc25.conf dc25.h \
-  dll.aliases dll.c dll.conf dmc.c dmc.conf dmc.h \
-  epson.c epson_scsi.c epson_usb.c epson.conf epson.h epson_scsi.h \
+  coolscan.conf.in coolscan.h coolscan-scsidef.h coolscan2.c coolscan2.conf.in \
+  dc210.c dc210.conf.in dc210.h \
+  dc240.c dc240.conf.in dc240.h dc25.c dc25.conf.in dc25.h \
+  dll.aliases dll.c dll.conf.in dmc.c dmc.conf.in dmc.h \
+  epson.c epson_scsi.c epson_usb.c epson.conf.in epson.h epson_scsi.h \
   epson_usb.h \
-  fujitsu.c fujitsu.conf fujitsu.h fujitsu-scsi.h \
-  gphoto2.c gphoto2.conf gphoto2.h \
+  fujitsu.c fujitsu.conf.in fujitsu.h fujitsu-scsi.h \
+  gphoto2.c gphoto2.conf.in gphoto2.h \
   gt68xx.c gt68xx.h gt68xx_high.c gt68xx_high.h gt68xx_mid.c gt68xx_mid.h \
   gt68xx_gt6801.c gt68xx_gt6801.h gt68xx_gt6816.c gt68xx_gt6816.h \
   gt68xx_low.c gt68xx_low.h gt68xx_devices.c gt68xx_generic.c \
   gt68xx_generic.h gt68xx_shm_channel.c \
-  gt68xx_shm_channel.h gt68xx.conf \
+  gt68xx_shm_channel.h gt68xx.conf.in \
   genesys.c genesys.h genesys_gl646.c genesys_low.h \
-  genesys.conf genesys_devices.c genesys_gl841.c \
+  genesys.conf.in genesys_devices.c genesys_gl841.c \
   genesys_conv.c genesys_conv_hlp.c \
-  hp-accessor.c hp-accessor.h hp.c hp.conf \
+  hp-accessor.c hp-accessor.h hp.c hp.conf.in \
   hp-device.c hp-device.h hp.h hp-handle.c hp-handle.h hp-hpmem.c hp-option.c \
   hp-option.h hp.README hp-scl.c hp-scl.h hp-scsi.h hp.TODO \
-  hpsj5s.c hpsj5s.conf hpsj5s.h \
-  hp4200.c  hp4200.conf  hp4200.h  hp4200_lm9830.c  hp4200_lm9830.h \
+  hpsj5s.c hpsj5s.conf.in hpsj5s.h \
+  hp4200.c  hp4200.conf.in  hp4200.h  hp4200_lm9830.c  hp4200_lm9830.h \
   hp3500.c \
-  hp5400.c hp5400.h hp5400.conf hp5400_debug.c hp5400_debug.h \
+  hp5400.c hp5400.h hp5400.conf.in hp5400_debug.c hp5400_debug.h \
   hp5400_internal.c hp5400_internal.h hp5400_xfer.h \
   hp5400_sane.c hp5400_sanei.c hp5400_sanei.h \
-  ibm.c ibm.conf ibm.h ibm-scsi.c \
-  leo.c leo.h leo.conf \
-  lexmark.c lexmark-x1100.c lexmark.h lexmark.conf \
+  ibm.c ibm.conf.in ibm.h ibm-scsi.c \
+  leo.c leo.h leo.conf.in \
+  lexmark.c lexmark-x1100.c lexmark.h lexmark.conf.in \
   lm9830.h \
-  ma1509.c ma1509.conf ma1509.h \
+  ma1509.c ma1509.conf.in ma1509.h \
   Makefile.in matsushita.c \
-  matsushita.conf matsushita.h microtek2.c microtek2.conf microtek2.h \
-  microtek.c microtek.conf microtek.h mustek.c mustek.conf mustek.h \
-  mustek_pp.c mustek_pp.conf mustek_pp.h mustek_pp_cis.c mustek_pp_cis.h \
+  matsushita.conf.in matsushita.h microtek2.c microtek2.conf.in microtek2.h \
+  microtek.c microtek.conf.in microtek.h mustek.c mustek.conf.in mustek.h \
+  mustek_pp.c mustek_pp.conf.in mustek_pp.h mustek_pp_cis.c mustek_pp_cis.h \
   mustek_pp_decl.h mustek_pp_drivers.h mustek_pp_null.c mustek_pp_ccd300.c \
-  mustek_pp_ccd300.h mustek_scsi_pp.c mustek_scsi_pp.h mustek_usb.c mustek_usb.conf \
+  mustek_pp_ccd300.h mustek_scsi_pp.c mustek_scsi_pp.h mustek_usb.c mustek_usb.conf.in \
   mustek_usb.h mustek_usb_high.c mustek_usb_high.h mustek_usb_low.c \
-  mustek_usb_low.h mustek_usb_mid.c mustek_usb_mid.h nec.c nec.conf nec.h \
+  mustek_usb_low.h mustek_usb_mid.c mustek_usb_mid.h nec.c nec.conf.in nec.h \
   mustek_usb2.c mustek_usb2.h mustek_usb2_asic.c \
   mustek_usb2_asic.h mustek_usb2_high.c mustek_usb2_high.h \
   mustek_usb2_reflective.c mustek_usb2_transparent.c \
-  net.c net.conf net.h niash.c niash_core.c niash_core.h \
-  niash_xfer.c niash_xfer.h pie.c pie.conf pie-scsidef.h pint.c pint.h \
-  plustek.c plustek.conf plustek-usbdevs.c plustek.h \
+  net.c net.conf.in net.h niash.c niash_core.c niash_core.h \
+  niash_xfer.c niash_xfer.h pie.c pie.conf.in pie-scsidef.h pint.c pint.h \
+  plustek.c plustek.conf.in plustek-usbdevs.c plustek.h \
   plustek-usb.c plustek-usb.h plustek-usbhw.c plustek-usbimg.c \
   plustek-usbio.c plustek-usbmap.c plustek-usbscan.c plustek-usbshading.c \
   plustek-usbcalfile.c plustek-usbcal.c \
@@ -145,28 +146,28 @@ DISTFILES = abaton.c abaton.conf abaton.h agfafocus.c agfafocus.conf \
   plustek-pp_p12ccd.c plustek-pp_p48xx.c plustek-pp_p9636.c plustek-pp_procfs.c \
   plustek-pp_procs.h plustek-pp_ptdrv.c plustek-pp_scale.c plustek-pp_scan.h \
   plustek-pp_scandata.h plustek-pp_sysdep.h plustek-pp_tpa.c plustek-pp_types.h \
-  plustek_pp.c plustek-pp_wrapper.c plustek_pp.conf plustek-pp.h \
-  pnm.c qcam.c qcam.conf qcam.h ricoh.c ricoh.conf ricoh.h \
-  ricoh-scsi.c s9036.c s9036.conf s9036.h saned.conf sane_strstatus.c \
-  sceptre.c sceptre.conf sceptre.h sharp.c sharp.conf sharp.h sm3600.c \
+  plustek_pp.c plustek-pp_wrapper.c plustek_pp.conf.in plustek-pp.h \
+  pnm.c qcam.c qcam.conf.in qcam.h ricoh.c ricoh.conf.in ricoh.h \
+  ricoh-scsi.c s9036.c s9036.conf.in s9036.h saned.conf.in sane_strstatus.c \
+  sceptre.c sceptre.conf.in sceptre.h sharp.c sharp.conf.in sharp.h sm3600.c \
   sm3600-color.c sm3600-gray.c sm3600.h sm3600-homerun.c sm3600-scanmtek.c \
-  sm3600-scantool.h sm3600-scanusb.c sm3600-scanutil.c snapscan.c \
-  snapscan.conf snapscan.h snapscan-scsi.c snapscan-sources.c snapscan-mutex.c \
-  snapscan-sources.h snapscan-usb.c snapscan-usb.h snapscan-options.c snapscan-data.c \
-  sp15c.c sp15c.conf sp15c.h sp15c-scsi.h st400.c st400.conf st400.h stubs.c \
-  tamarack.c tamarack.conf tamarack.h teco1.c teco1.h teco1.conf \
-  teco2.c teco2.conf teco2.h \
-  teco3.c teco3.conf teco3.h \
-  test.c test.conf test.h test-picture.c umax1220u.c \
-  u12.c u12.h u12-scanner.h u12-hwdef.h u12.conf u12-shading.c u12-tpa.c \
+  sm3600-scantool.h sm3600-scanusb.c sm3600-scanutil.c snapscan.c snapscan-data.c \
+  snapscan.conf.in snapscan.h snapscan-scsi.c snapscan-sources.c snapscan-mutex.c \
+  snapscan-sources.h snapscan-usb.c snapscan-usb.h snapscan-options.c sp15c.c \
+  sp15c.conf.in sp15c.h sp15c-scsi.h st400.c st400.conf.in st400.h stubs.c \
+  tamarack.c tamarack.conf.in tamarack.h teco1.c teco1.h teco1.conf.in \
+  teco2.c teco2.conf.in teco2.h \
+  teco3.c teco3.conf.in teco3.h \
+  test.c test.conf.in test.h test-picture.c umax1220u.c \
+  u12.c u12.h u12-scanner.h u12-hwdef.h u12.conf.in u12-shading.c u12-tpa.c \
   u12-ccd.c u12-hw.c u12-if.c u12-image.c u12-io.c u12-map.c u12-motor.c \
   umax1220u-common.c \
-  umax1220u.conf umax.c umax.conf umax.h umax_pp.c umax_pp.conf umax_pp.h \
+  umax1220u.conf.in umax.c umax.conf.in umax.h umax_pp.c umax_pp.conf.in umax_pp.h \
   umax_pp_low.c umax_pp_low.h umax_pp_mid.c umax_pp_mid.h umax-scanner.c \
   umax-scanner.h umax-scsidef.h umax-uc1200s.c umax-uc1200se.c umax-uc1260.c \
   umax-uc630.c umax-uc840.c umax-ug630.c umax-ug80.c umax-usb.c v4l.c \
-  v4l.conf v4l-frequencies.h v4l.h \
-  sm3840.conf sm3840.c sm3840_lib.c sm3840_params.h sm3840_scan.c sm3840.h \
+  v4l.conf.in v4l-frequencies.h v4l.h \
+  sm3840.conf.in sm3840.c sm3840_lib.c sm3840_params.h sm3840_scan.c sm3840.h \
   sm3840_lib.h
 
 
@@ -192,7 +193,7 @@ libsane-%.la: %.lo %-s.lo $(EXTRA) $(LIBOBJS)
 # Don't delete any intermediate files.
 .PRECIOUS: %-s.c %-s.lo %.lo dll-preload.c
 
-all:	$(LIBS) libsane.la
+all:	$(LIBS) libsane.la becfg
 
 install: $(INSTALL_LOCKPATH) install-be@BE_INSTALL_FLAVOR@ install-libsane install-becfg
 
@@ -285,6 +286,22 @@ libsane.la: dll.lo dll-s.lo $(EXTRA) $(addsuffix .lo,$(DLL_PRELOAD)) $(LIBOBJS)
 		$(addsuffix .lo,$(DLL_PRELOAD_EXTRAS)) @LIBTOOL_LINK_EXTRA@ \
 		-rpath $(libdir) -version-info $(V_MAJOR):$(V_REV):$(V_MINOR)
 
+becfg:
+	@for conf in $(CONFIGS) ; do \
+	   if test ! -f $${conf}.in ;  \
+	     then echo "Ignoring $${conf}" ;\
+	     continue; \
+	   fi ;\
+	   sed -e 's|@DATADIR@|$(datadir)|g' \
+	       -e 's|@CONFIGDIR@|$(configdir)|g' \
+	       -e 's|@DOCDIR@|$(docdir)|g' \
+	       -e 's|@LIBDIR@|$(libdir)/sane|g' \
+	       -e 's|@BINDIR@|$(bindir)|g' \
+	       -e 's|@SBINDIR@|$(sbindir)|g' \
+	       -e 's|@PACKAGEVERSION@|$(package_version)|g' $${conf}.in >$${conf} ;\
+	   echo Generating $${conf}... ;\
+	 done
+
 # additional dependencies
 
 EXTRA_canon_pp = canon_pp-io canon_pp-dev
@@ -524,7 +541,7 @@ depend:
 	makedepend -a -o.lo $(INCLUDES) *.c 2>/dev/null
 
 clean:
-	rm -f *.lo *.o *.la libsane.la dll-preload.c
+	rm -f *.lo *.o *.la libsane.la dll-preload.c *.conf
 	find . -type l -name \*-s.c | xargs rm -f
 	rm -rf .libs
 

backend/artec_eplus48u.conf.in

@@ -16,7 +16,7 @@ usb 0x05d8 0x4003
 # The scanner won't work without it
 #
 
-option artecFirmwareFile /usr/share/sane/artec_eplus48u/Artec48.usb
+option artecFirmwareFile @DATADIR@/sane/artec_eplus48u/Artec48.usb
 option ePlusPro   0
 
 #
@@ -73,7 +73,7 @@ usb 0x05d8 0x4006
 # The scanner won't work without it
 #
 
-option artecFirmwareFile /usr/share/sane/artec_eplus48u/Artec48.usb
+option artecFirmwareFile @DATADIR@/sane/artec_eplus48u/Artec48.usb
 
 #
 # for adjusting the default gamma values
@@ -131,7 +131,7 @@ usb 0x05d8 0x4005
 # The scanner won't work without it
 #
 
-option artecFirmwareFile /usr/share/sane/artec_eplus48u/Artec48.usb
+option artecFirmwareFile @DATADIR@/sane/artec_eplus48u/Artec48.usb
 
 #
 # for adjusting the default gamma values
@@ -189,7 +189,7 @@ usb 0x05d8 0x4007
 # The scanner won't work without it
 #
 
-option artecFirmwareFile /usr/share/sane/artec_eplus48u/Artec48.usb
+option artecFirmwareFile @DATADIR@/sane/artec_eplus48u/Artec48.usb
 
 #
 # for adjusting the default gamma values
@@ -247,7 +247,7 @@ usb 0x05d8 0x4009
 # The scanner won't work without it
 #
 
-option artecFirmwareFile /usr/share/sane/artec_eplus48u/Artec48.usb
+option artecFirmwareFile @DATADIR@/sane/artec_eplus48u/Artec48.usb
 
 #
 # for adjusting the default gamma values
@@ -306,7 +306,7 @@ usb 0x05d8 0x4004
 # The scanner won't work without it
 #
 
-option artecFirmwareFile /usr/share/sane/artec_eplus48u/1200.usb
+option artecFirmwareFile @DATADIR@/sane/artec_eplus48u/1200.usb
 
 #
 # Tell the backend that this is an Artec E+ Pro
@@ -372,7 +372,7 @@ usb 0x05d8 0x4010
 # The scanner won't work without it
 #
 
-option artecFirmwareFile /usr/share/sane/artec_eplus48u/1200.usb
+option artecFirmwareFile @DATADIR@/sane/artec_eplus48u/1200.usb
 
 #
 # for adjusting the default gamma values

backend/gt68xx.conf.in

@@ -1,11 +1,13 @@
 
-# gt68xx.conf: Configuration file for GT68XX based scanners
+# gt68xx.conf: Configuration file for GT68XX based scanners (@PACKAGEVERSION@)
 # Read man sane-gt68xx for documentation
 
+# Put the firmware file into "@DATADIR@/sane/gt68xx/".
+
 # Manual configuration is necessary for some scanners. Please uncomment the
 # override line and optinally the vendor and product lines that apply to your
 # scanner. For some scanners it's also necessary to change the name of the 
-# firmware file.
+# firmware file. 
 
 #############################################################################
 # For testing scanners that are not yet supported by this backend add the
@@ -162,15 +164,7 @@ usb 0x07b3 0x0403
 # Plustek OpticPro U16B doesn't need any manual settings
 
 # Plustek OpticPro UT16B
-#model "OpticPro UT16B"
-
-##############################################################################
-# Autodetect Plustek OpticPro S12
-usb 0x07b3 0x040b
-# Plustek OpticPro S12 doesn't need any manual settings
-
-# Plustek OpticPro ST12
-#model "OpticPro ST12"
+#model "UT16B"
 
 ##############################################################################
 # Autodetect Plustek OpticSlim M12

backend/snapscan.conf.in

@@ -2,7 +2,7 @@
 
 # Change to the fully qualified filename of your firmware file, if
 # firmware upload is needed by the scanner
-firmware /usr/share/sane/snapscan/your-firmwarefile.bin
+firmware @DATADIR@/sane/snapscan/your-firmwarefile.bin
 
 # If not automatically found you may manually specify a device name.
 
@@ -65,7 +65,7 @@ usb 0x04a5 0x20fc
 # Benq/Acer 5300
 usb 0x04a5 0x20fe
 
-# Benq 5150C / 5250C
+# Benq 5250C
 usb 0x04a5 0x2137
 
 # Agfa 1236U
@@ -110,6 +110,3 @@ usb 0x04b8 0x0121
 
 # Epson Perfection 3490
 usb 0x04b8 0x0122
-
-# Epson Stylus CX 1500
-usb 0x04b8 0x080c

backend/test.conf.in

@@ -28,9 +28,6 @@ resolution_max 1200.0
 resolution_quant 1.0
 resolution 50.0
 
-# Scan source (Flatbed, Automatic Document Feeder)
-scan-source Flatbed
-
 # Draw test picture ("Solid black", "Solid white", "Color pattern", "Grid")
 test-picture "Solid black"