On 01/04/2013 00:54, kazy82 at email.de wrote:
>
>
> Hi Stef,
> now I removed the automake package from ipkg and compile it without threads.
> Now autoreconf is running without the perl thread error.
> However, autoreconf stops with some errors.
> I copied the Log for you.
> Any ideas?
> Regards,
> Karsten
>
Hello,
here is an updated configure & Makefile.in .
Regards,
Stef
-------------- next part --------------
From e8010d88350d97d9c1702c3f25e7db42aa4d4759 Mon Sep 17 00:00:00 2001
From: =?ISO-8859-1?q?St=E9phane=20Voltz?= <stef....@free.fr>
Date: Mon, 1 Apr 2013 06:55:43 +0200
Subject: [PATCH] Makefile and configure
---
backend/Makefile.in | 186 ++++++++++++++++++++++++++++++++--------------------
configure | 21 ++----
2 files changed, 122 insertions(+), 85 deletions(-)
diff --git a/backend/Makefile.in b/backend/Makefile.in
index 0d622ac..3a8f87b 100644
--- a/backend/Makefile.in
+++ b/backend/Makefile.in
@@ -119,6 +119,9 @@ libcoolscan2_la_OBJECTS = $(am_libcoolscan2_la_OBJECTS)
libcoolscan3_la_LIBADD =
am_libcoolscan3_la_OBJECTS = libcoolscan3_la-coolscan3.lo
libcoolscan3_la_OBJECTS = $(am_libcoolscan3_la_OBJECTS)
+libcs3200f_la_LIBADD =
+am_libcs3200f_la_OBJECTS = libcs3200f_la-cs3200f.lo
+libcs3200f_la_OBJECTS = $(am_libcs3200f_la_OBJECTS)
libdc210_la_LIBADD =
am_libdc210_la_OBJECTS = libdc210_la-dc210.lo
libdc210_la_OBJECTS = $(am_libdc210_la_OBJECTS)
@@ -482,6 +485,18 @@ libsane_coolscan3_la_OBJECTS =
$(nodist_libsane_coolscan3_la_OBJECTS)
libsane_coolscan3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libsane_coolscan3_la_LDFLAGS) $(LDFLAGS) -o $@
+libsane_cs3200f_la_DEPENDENCIES = $(COMMON_LIBS) libcs3200f.la \
+ ../sanei/sanei_thread.lo ../sanei/sanei_init_debug.lo \
+ ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo \
+ sane_strstatus.lo ../sanei/sanei_usb.lo \
+ ../sanei/sanei_access.lo ../lib/md5.lo $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+nodist_libsane_cs3200f_la_OBJECTS = libsane_cs3200f_la-cs3200f-s.lo
+libsane_cs3200f_la_OBJECTS = $(nodist_libsane_cs3200f_la_OBJECTS)
+libsane_cs3200f_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(libsane_cs3200f_la_LDFLAGS) $(LDFLAGS) -o $@
libsane_dc210_la_DEPENDENCIES = $(COMMON_LIBS) libdc210.la \
../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo \
../sanei/sanei_config.lo sane_strstatus.lo \
@@ -1338,29 +1353,29 @@ SOURCES = $(libabaton_la_SOURCES)
$(libagfafocus_la_SOURCES) \
$(libcanon_dr_la_SOURCES) $(libcanon_pp_la_SOURCES) \
$(libcardscan_la_SOURCES) $(libcoolscan_la_SOURCES) \
$(libcoolscan2_la_SOURCES) $(libcoolscan3_la_SOURCES) \
- $(libdc210_la_SOURCES) $(libdc240_la_SOURCES) \
- $(libdc25_la_SOURCES) $(libdell1600n_net_la_SOURCES) \
- $(libdll_la_SOURCES) $(libdll_preload_la_SOURCES) \
- $(libdmc_la_SOURCES) $(libepjitsu_la_SOURCES) \
- $(libepson_la_SOURCES) $(libepson2_la_SOURCES) \
- $(libfujitsu_la_SOURCES) $(libgenesys_la_SOURCES) \
- $(libgphoto2_i_la_SOURCES) $(libgt68xx_la_SOURCES) \
- $(libhp_la_SOURCES) $(libhp3500_la_SOURCES) \
- $(libhp3900_la_SOURCES) $(libhp4200_la_SOURCES) \
- $(libhp5400_la_SOURCES) $(libhp5590_la_SOURCES) \
- $(libhpljm1005_la_SOURCES) $(libhpsj5s_la_SOURCES) \
- $(libhs2p_la_SOURCES) $(libibm_la_SOURCES) \
- $(libkodak_la_SOURCES) $(libkodakaio_la_SOURCES) \
- $(libkvs1025_la_SOURCES) $(libkvs20xx_la_SOURCES) \
- $(libkvs40xx_la_SOURCES) $(libleo_la_SOURCES) \
- $(liblexmark_la_SOURCES) $(libma1509_la_SOURCES) \
- $(libmagicolor_la_SOURCES) $(libmatsushita_la_SOURCES) \
- $(libmicrotek_la_SOURCES) $(libmicrotek2_la_SOURCES) \
- $(libmustek_la_SOURCES) $(libmustek_pp_la_SOURCES) \
- $(libmustek_usb_la_SOURCES) $(libmustek_usb2_la_SOURCES) \
- $(libnec_la_SOURCES) $(libnet_la_SOURCES) \
- $(libniash_la_SOURCES) $(libp5_la_SOURCES) \
- $(libpie_la_SOURCES) $(libpint_la_SOURCES) \
+ $(libcs3200f_la_SOURCES) $(libdc210_la_SOURCES) \
+ $(libdc240_la_SOURCES) $(libdc25_la_SOURCES) \
+ $(libdell1600n_net_la_SOURCES) $(libdll_la_SOURCES) \
+ $(libdll_preload_la_SOURCES) $(libdmc_la_SOURCES) \
+ $(libepjitsu_la_SOURCES) $(libepson_la_SOURCES) \
+ $(libepson2_la_SOURCES) $(libfujitsu_la_SOURCES) \
+ $(libgenesys_la_SOURCES) $(libgphoto2_i_la_SOURCES) \
+ $(libgt68xx_la_SOURCES) $(libhp_la_SOURCES) \
+ $(libhp3500_la_SOURCES) $(libhp3900_la_SOURCES) \
+ $(libhp4200_la_SOURCES) $(libhp5400_la_SOURCES) \
+ $(libhp5590_la_SOURCES) $(libhpljm1005_la_SOURCES) \
+ $(libhpsj5s_la_SOURCES) $(libhs2p_la_SOURCES) \
+ $(libibm_la_SOURCES) $(libkodak_la_SOURCES) \
+ $(libkodakaio_la_SOURCES) $(libkvs1025_la_SOURCES) \
+ $(libkvs20xx_la_SOURCES) $(libkvs40xx_la_SOURCES) \
+ $(libleo_la_SOURCES) $(liblexmark_la_SOURCES) \
+ $(libma1509_la_SOURCES) $(libmagicolor_la_SOURCES) \
+ $(libmatsushita_la_SOURCES) $(libmicrotek_la_SOURCES) \
+ $(libmicrotek2_la_SOURCES) $(libmustek_la_SOURCES) \
+ $(libmustek_pp_la_SOURCES) $(libmustek_usb_la_SOURCES) \
+ $(libmustek_usb2_la_SOURCES) $(libnec_la_SOURCES) \
+ $(libnet_la_SOURCES) $(libniash_la_SOURCES) \
+ $(libp5_la_SOURCES) $(libpie_la_SOURCES) $(libpint_la_SOURCES) \
$(libpixma_la_SOURCES) $(libplustek_la_SOURCES) \
$(libplustek_pp_la_SOURCES) $(libpnm_la_SOURCES) \
$(libqcam_la_SOURCES) $(libricoh_la_SOURCES) \
@@ -1381,6 +1396,7 @@ SOURCES = $(libabaton_la_SOURCES)
$(libagfafocus_la_SOURCES) \
$(nodist_libsane_coolscan_la_SOURCES) \
$(nodist_libsane_coolscan2_la_SOURCES) \
$(nodist_libsane_coolscan3_la_SOURCES) \
+ $(nodist_libsane_cs3200f_la_SOURCES) \
$(nodist_libsane_dc210_la_SOURCES) \
$(nodist_libsane_dc240_la_SOURCES) \
$(nodist_libsane_dc25_la_SOURCES) \
@@ -1471,29 +1487,29 @@ DIST_SOURCES = $(libabaton_la_SOURCES)
$(libagfafocus_la_SOURCES) \
$(libcanon_dr_la_SOURCES) $(libcanon_pp_la_SOURCES) \
$(libcardscan_la_SOURCES) $(libcoolscan_la_SOURCES) \
$(libcoolscan2_la_SOURCES) $(libcoolscan3_la_SOURCES) \
- $(libdc210_la_SOURCES) $(libdc240_la_SOURCES) \
- $(libdc25_la_SOURCES) $(libdell1600n_net_la_SOURCES) \
- $(libdll_la_SOURCES) $(libdll_preload_la_SOURCES) \
- $(libdmc_la_SOURCES) $(libepjitsu_la_SOURCES) \
- $(libepson_la_SOURCES) $(libepson2_la_SOURCES) \
- $(libfujitsu_la_SOURCES) $(libgenesys_la_SOURCES) \
- $(libgphoto2_i_la_SOURCES) $(libgt68xx_la_SOURCES) \
- $(libhp_la_SOURCES) $(libhp3500_la_SOURCES) \
- $(libhp3900_la_SOURCES) $(libhp4200_la_SOURCES) \
- $(libhp5400_la_SOURCES) $(libhp5590_la_SOURCES) \
- $(libhpljm1005_la_SOURCES) $(libhpsj5s_la_SOURCES) \
- $(libhs2p_la_SOURCES) $(libibm_la_SOURCES) \
- $(libkodak_la_SOURCES) $(libkodakaio_la_SOURCES) \
- $(libkvs1025_la_SOURCES) $(libkvs20xx_la_SOURCES) \
- $(libkvs40xx_la_SOURCES) $(libleo_la_SOURCES) \
- $(liblexmark_la_SOURCES) $(libma1509_la_SOURCES) \
- $(libmagicolor_la_SOURCES) $(libmatsushita_la_SOURCES) \
- $(libmicrotek_la_SOURCES) $(libmicrotek2_la_SOURCES) \
- $(libmustek_la_SOURCES) $(libmustek_pp_la_SOURCES) \
- $(libmustek_usb_la_SOURCES) $(libmustek_usb2_la_SOURCES) \
- $(libnec_la_SOURCES) $(libnet_la_SOURCES) \
- $(libniash_la_SOURCES) $(libp5_la_SOURCES) \
- $(libpie_la_SOURCES) $(libpint_la_SOURCES) \
+ $(libcs3200f_la_SOURCES) $(libdc210_la_SOURCES) \
+ $(libdc240_la_SOURCES) $(libdc25_la_SOURCES) \
+ $(libdell1600n_net_la_SOURCES) $(libdll_la_SOURCES) \
+ $(libdll_preload_la_SOURCES) $(libdmc_la_SOURCES) \
+ $(libepjitsu_la_SOURCES) $(libepson_la_SOURCES) \
+ $(libepson2_la_SOURCES) $(libfujitsu_la_SOURCES) \
+ $(libgenesys_la_SOURCES) $(libgphoto2_i_la_SOURCES) \
+ $(libgt68xx_la_SOURCES) $(libhp_la_SOURCES) \
+ $(libhp3500_la_SOURCES) $(libhp3900_la_SOURCES) \
+ $(libhp4200_la_SOURCES) $(libhp5400_la_SOURCES) \
+ $(libhp5590_la_SOURCES) $(libhpljm1005_la_SOURCES) \
+ $(libhpsj5s_la_SOURCES) $(libhs2p_la_SOURCES) \
+ $(libibm_la_SOURCES) $(libkodak_la_SOURCES) \
+ $(libkodakaio_la_SOURCES) $(libkvs1025_la_SOURCES) \
+ $(libkvs20xx_la_SOURCES) $(libkvs40xx_la_SOURCES) \
+ $(libleo_la_SOURCES) $(liblexmark_la_SOURCES) \
+ $(libma1509_la_SOURCES) $(libmagicolor_la_SOURCES) \
+ $(libmatsushita_la_SOURCES) $(libmicrotek_la_SOURCES) \
+ $(libmicrotek2_la_SOURCES) $(libmustek_la_SOURCES) \
+ $(libmustek_pp_la_SOURCES) $(libmustek_usb_la_SOURCES) \
+ $(libmustek_usb2_la_SOURCES) $(libnec_la_SOURCES) \
+ $(libnet_la_SOURCES) $(libniash_la_SOURCES) \
+ $(libp5_la_SOURCES) $(libpie_la_SOURCES) $(libpint_la_SOURCES) \
$(libpixma_la_SOURCES) $(libplustek_la_SOURCES) \
$(libplustek_pp_la_SOURCES) $(libpnm_la_SOURCES) \
$(libqcam_la_SOURCES) $(libricoh_la_SOURCES) \
@@ -1733,29 +1749,31 @@ EXTRA_DIST = sane_strstatus.c stubs.c saned.conf.in
abaton.conf.in \
dell1600n_net.conf.in dmc.conf.in epjitsu.conf.in \
epson.conf.in epson2.conf.in fujitsu.conf.in genesys.conf.in \
genesys_conv.c genesys_conv_hlp.c genesys_devices.c \
- gphoto2.conf.in gt68xx.conf.in gt68xx_devices.c \
- gt68xx_generic.c gt68xx_generic.h gt68xx_gt6801.c \
- gt68xx_gt6801.h gt68xx_gt6816.c gt68xx_gt6816.h gt68xx_high.c \
- gt68xx_high.h gt68xx_low.c gt68xx_low.h gt68xx_mid.c \
- gt68xx_mid.h gt68xx_shm_channel.c gt68xx_shm_channel.h \
- hp.conf.in hp.README hp.TODO hp3900.conf.in hp3900_config.c \
- hp3900_debug.c hp3900_rts8822.c hp3900_sane.c hp3900_types.c \
- hp3900_usb.c hp4200.conf.in hp4200_lm9830.c hp4200_lm9830.h \
- hp5400.conf.in hp5400_debug.c hp5400_debug.h hp5400_internal.c \
- hp5400_internal.h hp5400_sane.c hp5400_sanei.c hp5400_sanei.h \
- hp5400_xfer.h hp5590_cmds.c hp5590_cmds.h hp5590_low.c \
- hp5590_low.h hpsj5s.conf.in hs2p.conf.in hs2p-scsi.c \
- hs2p-scsi.h ibm.conf.in ibm-scsi.c kodak.conf.in \
- kodakaio.conf.in leo.conf.in lexmark.conf.in lexmark_models.c \
- lexmark_sensors.c ma1509.conf.in magicolor.conf.in \
- matsushita.conf.in microtek.conf.in microtek2.conf.in \
- mustek.conf.in mustek_scsi_pp.c mustek_scsi_pp.h \
- mustek_pp.conf.in mustek_pp_ccd300.c mustek_pp_ccd300.h \
- mustek_pp_cis.c mustek_pp_cis.h mustek_pp_null.c \
- mustek_usb.conf.in mustek_usb_high.c mustek_usb_high.h \
- mustek_usb_low.c mustek_usb_low.h mustek_usb_mid.c \
- mustek_usb_mid.h mustek_usb2_asic.c mustek_usb2_asic.h \
- mustek_usb2_high.c mustek_usb2_high.h mustek_usb2_reflective.c \
+ cs3200f-dat.c cs3200f-opt.c cs3200f-drv.c cs3200f-usb.c \
+ cs3200f-dev.c cs3200f-scan.c gphoto2.conf.in gt68xx.conf.in \
+ gt68xx_devices.c gt68xx_generic.c gt68xx_generic.h \
+ gt68xx_gt6801.c gt68xx_gt6801.h gt68xx_gt6816.c \
+ gt68xx_gt6816.h gt68xx_high.c gt68xx_high.h gt68xx_low.c \
+ gt68xx_low.h gt68xx_mid.c gt68xx_mid.h gt68xx_shm_channel.c \
+ gt68xx_shm_channel.h hp.conf.in hp.README hp.TODO \
+ hp3900.conf.in hp3900_config.c hp3900_debug.c hp3900_rts8822.c \
+ hp3900_sane.c hp3900_types.c hp3900_usb.c hp4200.conf.in \
+ hp4200_lm9830.c hp4200_lm9830.h hp5400.conf.in hp5400_debug.c \
+ hp5400_debug.h hp5400_internal.c hp5400_internal.h \
+ hp5400_sane.c hp5400_sanei.c hp5400_sanei.h hp5400_xfer.h \
+ hp5590_cmds.c hp5590_cmds.h hp5590_low.c hp5590_low.h \
+ hpsj5s.conf.in hs2p.conf.in hs2p-scsi.c hs2p-scsi.h \
+ ibm.conf.in ibm-scsi.c kodak.conf.in kodakaio.conf.in \
+ leo.conf.in lexmark.conf.in lexmark_models.c lexmark_sensors.c \
+ ma1509.conf.in magicolor.conf.in matsushita.conf.in \
+ microtek.conf.in microtek2.conf.in mustek.conf.in \
+ mustek_scsi_pp.c mustek_scsi_pp.h mustek_pp.conf.in \
+ mustek_pp_ccd300.c mustek_pp_ccd300.h mustek_pp_cis.c \
+ mustek_pp_cis.h mustek_pp_null.c mustek_usb.conf.in \
+ mustek_usb_high.c mustek_usb_high.h mustek_usb_low.c \
+ mustek_usb_low.h mustek_usb_mid.c mustek_usb_mid.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 nec.conf.in net.conf.in niash_core.c \
niash_core.h niash_xfer.c niash_xfer.h pie.conf.in p5.conf.in \
p5_device.c pixma.conf.in pixma_sane_options.c \
@@ -1855,7 +1873,7 @@ be_convenience_libs = libabaton.la libagfafocus.la \
libtamarack.la libtest.la libteco1.la \
libteco2.la libteco3.la libu12.la libumax.la \
libumax1220u.la libumax_pp.la libv4l.la \
- libxerox_mfp.la
+ libxerox_mfp.la libcs3200f.la
# Each stand alone backend thats possible to be built should be listed
@@ -1890,7 +1908,7 @@ be_dlopen_libs = libsane-abaton.la libsane-agfafocus.la \
libsane-tamarack.la libsane-test.la libsane-teco1.la \
libsane-teco2.la libsane-teco3.la libsane-u12.la libsane-umax.la \
libsane-umax1220u.la libsane-umax_pp.la libsane-v4l.la \
- libsane-xerox_mfp.la
+ libsane-xerox_mfp.la libsane-cs3200f.la
EXTRA_LTLIBRARIES = $(be_convenience_libs) $(be_dlopen_libs)
lib_LTLIBRARIES = libsane.la
@@ -2071,6 +2089,12 @@ nodist_libsane_genesys_la_SOURCES = genesys-s.c
libsane_genesys_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=genesys
libsane_genesys_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_genesys_la_LIBADD = $(COMMON_LIBS) libgenesys.la
../sanei/sanei_magic.lo ../sanei/sanei_init_debug.lo
../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo
../sanei/sanei_usb.lo $(MATH_LIB) $(USB_LIBS) $(RESMGR_LIBS)
+libcs3200f_la_SOURCES = cs3200f.c cs3200f-dev.h cs3200f-scan.h cs3200f-dat.h
cs3200f-opt.h cs3200f-drv.h cs3200f-usb.h
+libcs3200f_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=cs3200f
+nodist_libsane_cs3200f_la_SOURCES = cs3200f-s.c
+libsane_cs3200f_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=cs3200f
+libsane_cs3200f_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
+libsane_cs3200f_la_LIBADD = $(COMMON_LIBS) libcs3200f.la
../sanei/sanei_thread.lo ../sanei/sanei_init_debug.lo
../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo
../sanei/sanei_usb.lo ../sanei/sanei_access.lo ../lib/md5.lo $(MATH_LIB)
$(USB_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
libgphoto2_i_la_SOURCES = gphoto2.c gphoto2.h
libgphoto2_i_la_CPPFLAGS = $(AM_CPPFLAGS) @GPHOTO2_CPPFLAGS@
-DBACKEND_NAME=gphoto2
nodist_libsane_gphoto2_la_SOURCES = gphoto2-s.c
@@ -2608,6 +2632,8 @@ libcoolscan2.la: $(libcoolscan2_la_OBJECTS)
$(libcoolscan2_la_DEPENDENCIES)
$(LINK) $(libcoolscan2_la_OBJECTS) $(libcoolscan2_la_LIBADD) $(LIBS)
libcoolscan3.la: $(libcoolscan3_la_OBJECTS) $(libcoolscan3_la_DEPENDENCIES)
$(LINK) $(libcoolscan3_la_OBJECTS) $(libcoolscan3_la_LIBADD) $(LIBS)
+libcs3200f.la: $(libcs3200f_la_OBJECTS) $(libcs3200f_la_DEPENDENCIES)
+ $(LINK) $(libcs3200f_la_OBJECTS) $(libcs3200f_la_LIBADD) $(LIBS)
libdc210.la: $(libdc210_la_OBJECTS) $(libdc210_la_DEPENDENCIES)
$(LINK) $(libdc210_la_OBJECTS) $(libdc210_la_LIBADD) $(LIBS)
libdc240.la: $(libdc240_la_OBJECTS) $(libdc240_la_DEPENDENCIES)
@@ -2748,6 +2774,8 @@ libsane-coolscan2.la: $(libsane_coolscan2_la_OBJECTS)
$(libsane_coolscan2_la_DEP
$(libsane_coolscan2_la_LINK) $(libsane_coolscan2_la_OBJECTS)
$(libsane_coolscan2_la_LIBADD) $(LIBS)
libsane-coolscan3.la: $(libsane_coolscan3_la_OBJECTS)
$(libsane_coolscan3_la_DEPENDENCIES)
$(libsane_coolscan3_la_LINK) $(libsane_coolscan3_la_OBJECTS)
$(libsane_coolscan3_la_LIBADD) $(LIBS)
+libsane-cs3200f.la: $(libsane_cs3200f_la_OBJECTS)
$(libsane_cs3200f_la_DEPENDENCIES)
+ $(libsane_cs3200f_la_LINK) $(libsane_cs3200f_la_OBJECTS)
$(libsane_cs3200f_la_LIBADD) $(LIBS)
libsane-dc210.la: $(libsane_dc210_la_OBJECTS) $(libsane_dc210_la_DEPENDENCIES)
$(libsane_dc210_la_LINK) $(libsane_dc210_la_OBJECTS)
$(libsane_dc210_la_LIBADD) $(LIBS)
libsane-dc240.la: $(libsane_dc240_la_OBJECTS) $(libsane_dc240_la_DEPENDENCIES)
@@ -2957,6 +2985,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at
./$(DEPDIR)/libcoolscan2_la-coolscan2.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at
./$(DEPDIR)/libcoolscan3_la-coolscan3.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at
./$(DEPDIR)/libcoolscan_la-coolscan.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at
./$(DEPDIR)/libcs3200f_la-cs3200f.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdc210_la-dc210.Plo at
am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdc240_la-dc240.Plo at
am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdc25_la-dc25.Plo at
am__quote@
@@ -3066,6 +3095,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at
./$(DEPDIR)/libsane_coolscan2_la-coolscan2-s.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at
./$(DEPDIR)/libsane_coolscan3_la-coolscan3-s.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at
./$(DEPDIR)/libsane_coolscan_la-coolscan-s.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at
./$(DEPDIR)/libsane_cs3200f_la-cs3200f-s.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at
./$(DEPDIR)/libsane_dc210_la-dc210-s.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at
./$(DEPDIR)/libsane_dc240_la-dc240-s.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsane_dc25_la-dc25-s.Plo
at am__quote@
@@ -3310,6 +3340,13 @@ libcoolscan3_la-coolscan3.lo: coolscan3.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(libcoolscan3_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
libcoolscan3_la-coolscan3.lo `test -f 'coolscan3.c' || echo
'$(srcdir)/'`coolscan3.c
+libcs3200f_la-cs3200f.lo: cs3200f.c
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(libcs3200f_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
libcs3200f_la-cs3200f.lo -MD -MP -MF $(DEPDIR)/libcs3200f_la-cs3200f.Tpo -c -o
libcs3200f_la-cs3200f.lo `test -f 'cs3200f.c' || echo '$(srcdir)/'`cs3200f.c
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcs3200f_la-cs3200f.Tpo
$(DEPDIR)/libcs3200f_la-cs3200f.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cs3200f.c'
object='libcs3200f_la-cs3200f.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(libcs3200f_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
libcs3200f_la-cs3200f.lo `test -f 'cs3200f.c' || echo '$(srcdir)/'`cs3200f.c
+
libdc210_la-dc210.lo: dc210.c
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(libdc210_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
libdc210_la-dc210.lo -MD -MP -MF $(DEPDIR)/libdc210_la-dc210.Tpo -c -o
libdc210_la-dc210.lo `test -f 'dc210.c' || echo '$(srcdir)/'`dc210.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdc210_la-dc210.Tpo
$(DEPDIR)/libdc210_la-dc210.Plo
@@ -4073,6 +4110,13 @@ libsane_coolscan3_la-coolscan3-s.lo: coolscan3-s.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(libsane_coolscan3_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
libsane_coolscan3_la-coolscan3-s.lo `test -f 'coolscan3-s.c' || echo
'$(srcdir)/'`coolscan3-s.c
+libsane_cs3200f_la-cs3200f-s.lo: cs3200f-s.c
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(libsane_cs3200f_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
libsane_cs3200f_la-cs3200f-s.lo -MD -MP -MF
$(DEPDIR)/libsane_cs3200f_la-cs3200f-s.Tpo -c -o
libsane_cs3200f_la-cs3200f-s.lo `test -f 'cs3200f-s.c' || echo
'$(srcdir)/'`cs3200f-s.c
+ at am__fastdepCC_TRUE@ $(am__mv)
$(DEPDIR)/libsane_cs3200f_la-cs3200f-s.Tpo
$(DEPDIR)/libsane_cs3200f_la-cs3200f-s.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cs3200f-s.c'
object='libsane_cs3200f_la-cs3200f-s.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(libsane_cs3200f_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
libsane_cs3200f_la-cs3200f-s.lo `test -f 'cs3200f-s.c' || echo
'$(srcdir)/'`cs3200f-s.c
+
libsane_dc210_la-dc210-s.lo: dc210-s.c
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(libsane_dc210_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
libsane_dc210_la-dc210-s.lo -MD -MP -MF $(DEPDIR)/libsane_dc210_la-dc210-s.Tpo
-c -o libsane_dc210_la-dc210-s.lo `test -f 'dc210-s.c' || echo
'$(srcdir)/'`dc210-s.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsane_dc210_la-dc210-s.Tpo
$(DEPDIR)/libsane_dc210_la-dc210-s.Plo
diff --git a/configure b/configure
index 0c853a4..1e03112 100755
--- a/configure
+++ b/configure
@@ -4972,7 +4972,6 @@ fi
-
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a
program name with args.
@@ -7581,7 +7580,6 @@ if test -n "$LIBV4L_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBV4L_CFLAGS=`$PKG_CONFIG --cflags "libv4l1" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -7598,7 +7596,6 @@ if test -n "$LIBV4L_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBV4L_LIBS=`$PKG_CONFIG --libs "libv4l1" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -7618,9 +7615,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBV4L_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libv4l1" 2>&1`
+ LIBV4L_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"libv4l1" 2>&1`
else
- LIBV4L_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libv4l1" 2>&1`
+ LIBV4L_PKG_ERRORS=`$PKG_CONFIG --print-errors "libv4l1" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBV4L_PKG_ERRORS" >&5
@@ -7664,7 +7661,6 @@ if test -n "$AVAHI_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_AVAHI_CFLAGS=`$PKG_CONFIG --cflags " avahi-client >= 0.6.24 "
2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -7681,7 +7677,6 @@ if test -n "$AVAHI_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_AVAHI_LIBS=`$PKG_CONFIG --libs " avahi-client >= 0.6.24 " 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -7701,9 +7696,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs " avahi-client >= 0.6.24 " 2>&1`
+ AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
avahi-client >= 0.6.24 " 2>&1`
else
- AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
avahi-client >= 0.6.24 " 2>&1`
+ AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors " avahi-client >=
0.6.24 " 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$AVAHI_PKG_ERRORS" >&5
@@ -9678,7 +9673,6 @@ if test -n "$LIBUSB_1_0_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBUSB_1_0_CFLAGS=`$PKG_CONFIG --cflags " libusb-1.0 >= 1.0.0 "
2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -9695,7 +9689,6 @@ if test -n "$LIBUSB_1_0_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBUSB_1_0_LIBS=`$PKG_CONFIG --libs " libusb-1.0 >= 1.0.0 "
2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -9715,9 +9708,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBUSB_1_0_PKG_ERRORS=`$PKG_CONFIG --short-errors
--print-errors --cflags --libs " libusb-1.0 >= 1.0.0 " 2>&1`
+ LIBUSB_1_0_PKG_ERRORS=`$PKG_CONFIG --short-errors
--print-errors " libusb-1.0 >= 1.0.0 " 2>&1`
else
- LIBUSB_1_0_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags
--libs " libusb-1.0 >= 1.0.0 " 2>&1`
+ LIBUSB_1_0_PKG_ERRORS=`$PKG_CONFIG --print-errors " libusb-1.0
>= 1.0.0 " 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBUSB_1_0_PKG_ERRORS" >&5
@@ -17710,7 +17703,7 @@ ALL_BACKENDS="abaton agfafocus apple artec
artec_eplus48u as6e \
pixma plustek plustek_pp qcam ricoh rts8891 s9036 \
sceptre sharp sm3600 sm3840 snapscan sp15c st400 \
stv680 tamarack teco1 teco2 teco3 test u12 umax
- umax_pp umax1220u v4l xerox_mfp p5"
+ umax_pp umax1220u v4l xerox_mfp p5 cs3200f"
# If user specifies backends manually then cause configure
# to fail if its detected it can't be compiled. If we
--
1.8.1.4
