linking xerox_mfp to build infrastructure

AUTHORS

@@ -101,6 +101,7 @@ Backends:
  umax_pp:       Stéphane Voltz (*)
  umax1220u:     Marcio L. Teixeira, Patrick Lessard
  v4l:           Juergen G. Schimmer, and Henning Geinitz (*)
+ xerox_mfp:     Alex Belkin (*)
 
 Frontends:
 
@@ -136,6 +137,7 @@ Email addresses:
 
 Abel Deuring <a.deuring@satzbau-gmbh.de>
 Alessandro Zummo <a.zummo@towertech.it>
+Alex Belkin <abc@telekom.ru>
 Andras Major <andras@users.sourceforge.net>
 Andreas Beck <becka@uni-duesseldorf.de>
 Andreas Bolsch <ab@maths.nott.ac.uk>

backend/Makefile.in

@@ -211,7 +211,8 @@ DISTFILES = Makefile.in saned.conf.in sane_strstatus.c stubs.c \
   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 \
   umax1220u.c umax1220u-common.c umax1220u.conf.in \
-  v4l.c v4l.conf.in v4l-frequencies.h v4l.h
+  v4l.c v4l.conf.in v4l-frequencies.h v4l.h \
+  xerox_mfp.c xerox_mfp.h
 
 .PHONY: all clean depend dist distclean install uninstall
 
@@ -587,6 +588,8 @@ libsane-umax1220u.la: ../sanei/sanei_constrain_value.lo
 libsane-umax1220u.la: ../sanei/sanei_usb.lo
 libsane-umax1220u.la: ../sanei/sanei_pv8630.lo
 libsane-v4l.la: ../sanei/sanei_constrain_value.lo
+libsane-xerox_mfp.la: ../sanei/sanei_constrain_value.lo
+libsane-xerox_mfp.la: ../sanei/sanei_usb.lo
 
 ifneq ($(DLL_PRELOAD),)
 # need to make dll dependent on all sanei files:

backend/xerox_mfp.c

@@ -903,8 +903,11 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local)
 
   DBG (3, "%s: %p, %d\n", __FUNCTION__, (void *)device_list, local);
 
-  if (devlist)
+  if (devlist) {
+    if (device_list)
+      *device_list = devlist;
     return SANE_STATUS_GOOD;
+  }
 
   free_devices ();
   sanei_usb_set_timeout (1000);

configure

@@ -27274,7 +27274,8 @@ echo "$as_me: Manually selected backends: ${BACKENDS}" >&6;}
 	  ma1509 matsushita microtek microtek2 mustek mustek_usb \
 	  nec niash pie pixma plustek ricoh rts8891 \
 	  s9036 sceptre sharp sm3600 sm3840 snapscan sp15c st400 stv680 \
-	  tamarack teco1 teco2 teco3 test u12 umax umax_pp umax1220u"
+	  tamarack teco1 teco2 teco3 test u12 umax umax_pp umax1220u \
+	  xerox_mfp"
 
     case "$host_os" in
 	gnu*)

configure.in

@@ -382,7 +382,8 @@ else
 	  ma1509 matsushita microtek microtek2 mustek mustek_usb \
 	  nec niash pie pixma plustek ricoh rts8891 \
 	  s9036 sceptre sharp sm3600 sm3840 snapscan sp15c st400 stv680 \
-	  tamarack teco1 teco2 teco3 test u12 umax umax_pp umax1220u"
+	  tamarack teco1 teco2 teco3 test u12 umax umax_pp umax1220u \
+	  xerox_mfp"
 
     case "$host_os" in
 	gnu*) 

doc/Makefile.in

@@ -56,7 +56,7 @@ SECT5	= sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 sane-dll.5 \
 	  sane-niash.5 sane-sm3840.5 sane-genesys.5 sane-hp4200.5 \
 	  sane-mustek_usb2.5 sane-hp3500.5 sane-pixma.5 sane-stv680.5 \
 	  sane-hp5590.5 sane-hpljm1005.5 sane-cardscan.5 sane-hp3900.5 \
-	  sane-epjitsu.5 sane-hs2p.5 sane-canon_dr.5
+	  sane-epjitsu.5 sane-hs2p.5 sane-canon_dr.5 sane-xerox_mfp.5
 SECT7   = sane.7
 SECT8	= saned.8
 MANPAGES = $(SECT1) $(SECT5) $(SECT7) $(SECT8)
@@ -115,7 +115,7 @@ DISTFILES = Makefile.in backend-writing.txt descriptions.txt \
   sane-u12.man sane-niash.man sane-sm3840.man sane-genesys.man sane-hp4200.man \
   sane-mustek_usb2.man sane-hp3500.man sane-pixma.man sane-stv680.man \
   sane-hp5590.man sane-hpljm1005.man sane-cardscan.man sane-hp3900.man \
-  sane-epjitsu.man sane-hs2p.man sane-canon_dr.man
+  sane-epjitsu.man sane-hs2p.man sane-canon_dr.man sane_xerox_mfp.man
 
 .PHONY: all clean depend dist distclean html html-man install \
   sane-html uninstall

doc/descriptions/xerox_mfp.desc

@@ -1,4 +1,6 @@
 :backend "xerox_mfp"
+:version "1.0-3"
+:manpage "sane-xerox_mfp"
 :comment "Phaser 3200MFP support"
 :devicetype :scanner