* configure.in, backend/Makefile.am: Add back in support for

optionally linking in sanei_jpeg.lo under backend directory; but using configure and not with GNU make extensions. Move back to libtool's -version-info instead of -version-number because the later has known bugs on platforms such as OS/2.
2009-02-07 02:00:51 +00:00 · 2009-02-07 02:00:51 +00:00 · 144b1a3cfb
commit 144b1a3cfb
--- a/7
+++ b/7
@ -1,3 +1,10 @@
+2009-02-06 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
+	* configure.in, backend/Makefile.am: Add back in support for
+	optionally linking in sanei_jpeg.lo under backend directory; 
+	but using configure and not with GNU make extensions.
+	Move back to libtool's -version-info instead of -version-number
+	because the later has known bugs on platforms such as OS/2.
+
 2009-02-04 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
 	* configure.in, acinclude.ac: Cleanup autoconf 2.63 warnings.  
 	add cv_ prefix to cached variable.  Remove AC_ARG_PROGRAM as
--- a/Makefile.in
+++ b/Makefile.in
@ -176,6 +176,7 @@ RANLIB = @RANLIB@
 SANED = @SANED@
 SANEI_JPEG = @SANEI_JPEG@
 SANEI_JPEG_LO = @SANEI_JPEG_LO@
+SANEI_SANEI_JPEG_LO = @SANEI_SANEI_JPEG_LO@
 SANE_CONFIG_PATH = @SANE_CONFIG_PATH@
 SCSI_LIBS = @SCSI_LIBS@
 SED = @SED@
--- a/backend/Makefile.am
+++ b/backend/Makefile.am
@ -21,8 +21,8 @@ AM_LDFLAGS = @STRICT_LDFLAGS@
 # The -rpath option is added because we are creating _LTLIBRARIES based
 # on configure substitution.  This causes automake to not know the
 # correct $libdir and must be added here.
-DIST_SANELIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)/sane' -version-number $(V_MAJOR):$(V_MINOR):$(V_REV) $(DYNAMIC_FLAG)
-DIST_LIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)' -version-number $(V_MAJOR):$(V_MINOR):$(V_REV)
+DIST_SANELIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)/sane' -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
+DIST_LIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)' -version-info $(V_MAJOR):$(V_REV):$(V_MINOR)

 # LIBTOOL install is a little to noisy for my liking.
 LIBTOOL = @LIBTOOL@ --silent
@ -357,7 +357,7 @@ libdc210_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dc210
 nodist_libsane_dc210_la_SOURCES = dc210-s.c
 libsane_dc210_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dc210
 libsane_dc210_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
-libsane_dc210_la_LIBADD = $(COMMON_LIBS) libdc210.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo ../sanei/sanei_jpeg.lo @JPEG_LIBS@
+libsane_dc210_la_LIBADD = $(COMMON_LIBS) libdc210.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo @SANEI_SANEI_JPEG_LO@ @JPEG_LIBS@
 EXTRA_DIST += dc210.conf.in

 libdc240_la_SOURCES = dc240.c dc240.h
@ -366,7 +366,7 @@ libdc240_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dc240
 nodist_libsane_dc240_la_SOURCES = dc240-s.c
 libsane_dc240_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dc240
 libsane_dc240_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
-libsane_dc240_la_LIBADD = $(COMMON_LIBS) libdc240.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo ../sanei/sanei_jpeg.lo @JPEG_LIBS@
+libsane_dc240_la_LIBADD = $(COMMON_LIBS) libdc240.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo @SANEI_SANEI_JPEG_LO@ @JPEG_LIBS@

 EXTRA_DIST += dc240.conf.in

@ -440,7 +440,7 @@ libgphoto2_i_la_CPPFLAGS = $(AM_CPPFLAGS) @GPHOTO2_CPPFLAGS@ -DBACKEND_NAME=gpho
 nodist_libsane_gphoto2_la_SOURCES = gphoto2-s.c 
 libsane_gphoto2_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=gphoto2
 libsane_gphoto2_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
-libsane_gphoto2_la_LIBADD = $(COMMON_LIBS) libgphoto2_i.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo ../sanei/sanei_jpeg.lo @GPHOTO2_LIBS@ @JPEG_LIBS@
+libsane_gphoto2_la_LIBADD = $(COMMON_LIBS) libgphoto2_i.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo @SANEI_SANEI_JPEG_LO@ @GPHOTO2_LIBS@ @JPEG_LIBS@
 EXTRA_DIST += gphoto2.conf.in

 libgt68xx_la_SOURCES = gt68xx.c gt68xx.h
@ -963,6 +963,6 @@ EXTRA_DIST += dll.conf.in dll.aliases
 nodist_libsane_la_SOURCES =  dll-s.c dll-preload.h
 libsane_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll
 libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS)
-libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_jpeg.lo @DL_LIBS@ @LIBV4L_LIBS@ @MATH_LIB@ @IEEE1284_LIBS@ @TIFF_LIBS@ @JPEG_LIBS@ @GPHOTO2_LIBS@ @SOCKET_LIBS@ @USB_LIBS@ @AVAHI_LIBS@
+libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo @SANEI_SANEI_JPEG_LO@ @DL_LIBS@ @LIBV4L_LIBS@ @MATH_LIB@ @IEEE1284_LIBS@ @TIFF_LIBS@ @JPEG_LIBS@ @GPHOTO2_LIBS@ @SOCKET_LIBS@ @USB_LIBS@ @AVAHI_LIBS@
 # WARNING: Automake is getting this wrong so have to do it ourselves.
-libsane_la_DEPENDENCIES = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_jpeg.lo
+libsane_la_DEPENDENCIES = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo @SANEI_SANEI_JPEG_LO@
--- a/backend/Makefile.in
+++ b/backend/Makefile.in
@ -413,8 +413,7 @@ libsane_coolscan3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(libsane_coolscan3_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 \
-	../sanei/sanei_jpeg.lo
+	../sanei/sanei_config.lo sane_strstatus.lo
 nodist_libsane_dc210_la_OBJECTS = libsane_dc210_la-dc210-s.lo
 libsane_dc210_la_OBJECTS = $(nodist_libsane_dc210_la_OBJECTS)
 libsane_dc210_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@ -422,8 +421,7 @@ libsane_dc210_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(libsane_dc210_la_LDFLAGS) $(LDFLAGS) -o $@
 libsane_dc240_la_DEPENDENCIES = $(COMMON_LIBS) libdc240.la \
 	../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo \
-	../sanei/sanei_config.lo sane_strstatus.lo \
-	../sanei/sanei_jpeg.lo
+	../sanei/sanei_config.lo sane_strstatus.lo
 nodist_libsane_dc240_la_OBJECTS = libsane_dc240_la-dc240-s.lo
 libsane_dc240_la_OBJECTS = $(nodist_libsane_dc240_la_OBJECTS)
 libsane_dc240_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@ -515,8 +513,7 @@ libsane_genesys_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(libsane_genesys_la_LDFLAGS) $(LDFLAGS) -o $@
 libsane_gphoto2_la_DEPENDENCIES = $(COMMON_LIBS) libgphoto2_i.la \
 	../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo \
-	../sanei/sanei_config.lo sane_strstatus.lo \
-	../sanei/sanei_jpeg.lo
+	../sanei/sanei_config.lo sane_strstatus.lo
 nodist_libsane_gphoto2_la_OBJECTS = libsane_gphoto2_la-gphoto2-s.lo
 libsane_gphoto2_la_OBJECTS = $(nodist_libsane_gphoto2_la_OBJECTS)
 libsane_gphoto2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@ -1357,6 +1354,7 @@ RANLIB = @RANLIB@
 SANED = @SANED@
 SANEI_JPEG = @SANEI_JPEG@
 SANEI_JPEG_LO = @SANEI_JPEG_LO@
+SANEI_SANEI_JPEG_LO = @SANEI_SANEI_JPEG_LO@
 SANE_CONFIG_PATH = @SANE_CONFIG_PATH@
 SCSI_LIBS = @SCSI_LIBS@
 SED = @SED@
@ -1434,8 +1432,8 @@ AM_LDFLAGS = @STRICT_LDFLAGS@
 # The -rpath option is added because we are creating _LTLIBRARIES based
 # on configure substitution.  This causes automake to not know the
 # correct $libdir and must be added here.
-DIST_SANELIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)/sane' -version-number $(V_MAJOR):$(V_MINOR):$(V_REV) $(DYNAMIC_FLAG)
-DIST_LIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)' -version-number $(V_MAJOR):$(V_MINOR):$(V_REV)
+DIST_SANELIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)/sane' -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
+DIST_LIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)' -version-info $(V_MAJOR):$(V_REV):$(V_MINOR)
 FIRMWARE_DIRS = artec_eplus48u gt68xx snapscan epjitsu

 # TODO: This really belongs together with the saned sources and
@ -1700,13 +1698,13 @@ libdc210_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dc210
 nodist_libsane_dc210_la_SOURCES = dc210-s.c
 libsane_dc210_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dc210
 libsane_dc210_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
-libsane_dc210_la_LIBADD = $(COMMON_LIBS) libdc210.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo ../sanei/sanei_jpeg.lo @JPEG_LIBS@
+libsane_dc210_la_LIBADD = $(COMMON_LIBS) libdc210.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo @SANEI_SANEI_JPEG_LO@ @JPEG_LIBS@
 libdc240_la_SOURCES = dc240.c dc240.h
 libdc240_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dc240
 nodist_libsane_dc240_la_SOURCES = dc240-s.c
 libsane_dc240_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dc240
 libsane_dc240_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
-libsane_dc240_la_LIBADD = $(COMMON_LIBS) libdc240.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo ../sanei/sanei_jpeg.lo @JPEG_LIBS@
+libsane_dc240_la_LIBADD = $(COMMON_LIBS) libdc240.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo @SANEI_SANEI_JPEG_LO@ @JPEG_LIBS@
 libdell1600n_net_la_SOURCES = dell1600n_net.c
 libdell1600n_net_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dell1600n_net
 nodist_libsane_dell1600n_net_la_SOURCES = dell1600n_net-s.c
@ -1754,7 +1752,7 @@ libgphoto2_i_la_CPPFLAGS = $(AM_CPPFLAGS) @GPHOTO2_CPPFLAGS@ -DBACKEND_NAME=gpho
 nodist_libsane_gphoto2_la_SOURCES = gphoto2-s.c 
 libsane_gphoto2_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=gphoto2
 libsane_gphoto2_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
-libsane_gphoto2_la_LIBADD = $(COMMON_LIBS) libgphoto2_i.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo ../sanei/sanei_jpeg.lo @GPHOTO2_LIBS@ @JPEG_LIBS@
+libsane_gphoto2_la_LIBADD = $(COMMON_LIBS) libgphoto2_i.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo @SANEI_SANEI_JPEG_LO@ @GPHOTO2_LIBS@ @JPEG_LIBS@
 libgt68xx_la_SOURCES = gt68xx.c gt68xx.h
 libgt68xx_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=gt68xx
 nodist_libsane_gt68xx_la_SOURCES = gt68xx-s.c 
@ -2097,9 +2095,9 @@ libsane_dll_la_LIBADD = $(COMMON_LIBS) libdll.la ../sanei/sanei_init_debug.lo ..
 nodist_libsane_la_SOURCES = dll-s.c dll-preload.h
 libsane_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll
 libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS)
-libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_jpeg.lo @DL_LIBS@ @LIBV4L_LIBS@ @MATH_LIB@ @IEEE1284_LIBS@ @TIFF_LIBS@ @JPEG_LIBS@ @GPHOTO2_LIBS@ @SOCKET_LIBS@ @USB_LIBS@ @AVAHI_LIBS@
+libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo @SANEI_SANEI_JPEG_LO@ @DL_LIBS@ @LIBV4L_LIBS@ @MATH_LIB@ @IEEE1284_LIBS@ @TIFF_LIBS@ @JPEG_LIBS@ @GPHOTO2_LIBS@ @SOCKET_LIBS@ @USB_LIBS@ @AVAHI_LIBS@
 # WARNING: Automake is getting this wrong so have to do it ourselves.
-libsane_la_DEPENDENCIES = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_jpeg.lo
+libsane_la_DEPENDENCIES = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo @SANEI_SANEI_JPEG_LO@
 all: all-am

 .SUFFIXES:
--- a/49
+++ b/49
@ -798,6 +798,7 @@ BACKEND_CONFS_ENABLED
 PRELOADABLE_BACKENDS_ENABLED
 PRELOADABLE_BACKENDS
 BACKEND_LIBS_ENABLED
+SANEI_SANEI_JPEG_LO
 SANEI_JPEG_LO
 SANEI_JPEG
 SANED
@ -15978,7 +15979,7 @@ ia64-*-hpux*)
  ;;
 *-*-irix6*)
  # Find out which ABI we are using.
-  echo '#line 15981 "configure"' > conftest.$ac_ext
+  echo '#line 15982 "configure"' > conftest.$ac_ext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
@ -18858,11 +18859,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18861: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18862: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:18865: \$? = $ac_status" >&5
+   echo "$as_me:18866: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -19148,11 +19149,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19151: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19152: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:19155: \$? = $ac_status" >&5
+   echo "$as_me:19156: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -19252,11 +19253,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19255: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19256: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:19259: \$? = $ac_status" >&5
+   echo "$as_me:19260: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -21654,7 +21655,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 21657 "configure"
+#line 21658 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -21754,7 +21755,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 21757 "configure"
+#line 21758 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -24167,11 +24168,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:24170: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:24171: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:24174: \$? = $ac_status" >&5
+   echo "$as_me:24175: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -24271,11 +24272,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:24274: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:24275: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:24278: \$? = $ac_status" >&5
+   echo "$as_me:24279: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -25856,11 +25857,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:25859: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:25860: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:25863: \$? = $ac_status" >&5
+   echo "$as_me:25864: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -25960,11 +25961,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:25963: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:25964: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:25967: \$? = $ac_status" >&5
+   echo "$as_me:25968: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -28181,11 +28182,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:28184: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:28185: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:28188: \$? = $ac_status" >&5
+   echo "$as_me:28189: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -28471,11 +28472,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:28474: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:28475: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:28478: \$? = $ac_status" >&5
+   echo "$as_me:28479: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -28575,11 +28576,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:28578: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:28579: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:28582: \$? = $ac_status" >&5
+   echo "$as_me:28583: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -31435,10 +31436,12 @@ done
 if test "${sane_cv_use_libjpeg}" = "yes"; then
  SANEI_JPEG="sanei_jpeg.o"
  SANEI_JPEG_LO="sanei_jpeg.lo"
+  SANEI_SANEI_JPEG_LO="../sanei/sanei_jpeg.lo"
 fi



+
 # Check whether --enable-pnm-backend was given.
 if test "${enable_pnm_backend+set}" = set; then
  enableval=$enable_pnm_backend; FILTERED_BACKENDS="${FILTERED_BACKENDS} pnm"
--- a/configure.in
+++ b/configure.in
@ -514,9 +514,11 @@ SANE_CHECK_BACKENDS
 if test "${sane_cv_use_libjpeg}" = "yes"; then
  SANEI_JPEG="sanei_jpeg.o"
  SANEI_JPEG_LO="sanei_jpeg.lo"
+  SANEI_SANEI_JPEG_LO="../sanei/sanei_jpeg.lo"
 fi
 AC_SUBST(SANEI_JPEG)
 AC_SUBST(SANEI_JPEG_LO)
+AC_SUBST(SANEI_SANEI_JPEG_LO)

 AC_ARG_ENABLE(pnm-backend, 
  AC_HELP_STRING([--enable-pnm-backend],
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@ -162,6 +162,7 @@ RANLIB = @RANLIB@
 SANED = @SANED@
 SANEI_JPEG = @SANEI_JPEG@
 SANEI_JPEG_LO = @SANEI_JPEG_LO@
+SANEI_SANEI_JPEG_LO = @SANEI_SANEI_JPEG_LO@
 SANE_CONFIG_PATH = @SANE_CONFIG_PATH@
 SCSI_LIBS = @SCSI_LIBS@
 SED = @SED@