Link to djpeg only once.

Henning Meier-Geinitz <henning@meier-geinitz.de>

configure

@@ -1608,7 +1608,7 @@ for ac_hdr in fcntl.h unistd.h libc.h sys/dsreq.h sys/select.h \
     camlib.h os2.h sys/socket.h sys/io.h asm/io.h gscdds.h sys/hw.h \
     sys/types.h sys/scsi/scsi.h sys/scsi/sgdefs.h sys/scsi/targets/scgio.h \
     apollo/scsi.h sys/sdi_comm.h sys/passthrudef.h linux/ppdev.h usb.h \
-    sys/bitypes.h
+    sys/bitypes.h sys/sem.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -1642,7 +1642,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_hdr 1
 EOF
- sys/sem.h
+ 
 else
   echo "$ac_t""no" 1>&6
 fi
@@ -4265,13 +4265,16 @@ if test "${sane_cv_use_libjpeg}" != "yes"; then
   echo "disabling DC210/DC240 backends (failed to find JPEG library)"
   DC210=
   DC240=
+  DJPEG=
 else
   echo "enabling DC210/DC240 backends"
   DC210=dc210
   DC240=dc240
+  DJPEG=djpeg
 fi
 
 
+
 if test "${ac_cv_header_sys_scanio_h}" = "no"; then
   echo "disabling PINT backend"
   PINT=
@@ -4375,7 +4378,7 @@ fi
 # Extract the first word of "sane-config", so it can be a program name with args.
 set dummy sane-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4379: checking for $ac_word" >&5
+echo "configure:4382: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SANE_CONFIG_PATH'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4409,7 +4412,7 @@ else
 fi
 
 echo $ac_n "checking for sane_init in -lsane""... $ac_c" 1>&6
-echo "configure:4413: checking for sane_init in -lsane" >&5
+echo "configure:4416: checking for sane_init in -lsane" >&5
 ac_lib_var=`echo sane'_'sane_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4417,7 +4420,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsane  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4421 "configure"
+#line 4424 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4428,7 +4431,7 @@ int main() {
 sane_init()
 ; return 0; }
 EOF
-if { (eval echo configure:4432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4623,6 +4626,7 @@ s%@LIBTOOL@%$LIBTOOL%g
 s%@INCLUDES@%$INCLUDES%g
 s%@DC210@%$DC210%g
 s%@DC240@%$DC240%g
+s%@DJPEG@%$DJPEG%g
 s%@PINT@%$PINT%g
 s%@QCAM@%$QCAM%g
 s%@V4L@%$V4L%g

configure.in

@@ -104,7 +104,7 @@ AC_CHECK_HEADERS(fcntl.h unistd.h libc.h sys/dsreq.h sys/select.h \
     camlib.h os2.h sys/socket.h sys/io.h asm/io.h gscdds.h sys/hw.h \
     sys/types.h sys/scsi/scsi.h sys/scsi/sgdefs.h sys/scsi/targets/scgio.h \
     apollo/scsi.h sys/sdi_comm.h sys/passthrudef.h linux/ppdev.h usb.h \
-    sys/bitypes.h, sys/sem.h)
+    sys/bitypes.h sys/sem.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -209,13 +209,16 @@ if test "${sane_cv_use_libjpeg}" != "yes"; then
   echo "disabling DC210/DC240 backends (failed to find JPEG library)"
   DC210=
   DC240=
+  DJPEG=
 else
   echo "enabling DC210/DC240 backends"
   DC210=dc210
   DC240=dc240
+  DJPEG=djpeg
 fi
 AC_SUBST(DC210)
 AC_SUBST(DC240)
+AC_SUBST(DJPEG)
 if test "${ac_cv_header_sys_scanio_h}" = "no"; then
   echo "disabling PINT backend"
   PINT=