Added checks for libieee1284. Enable canon_pp backend if found. Patch from

"Matthew Duggan" <stauff@guarana.org>.
Henning Meier-Geinitz <henning@meier-geinitz.de>

acinclude.m4

@@ -4,6 +4,7 @@ dnl   SANE_EXTRACT_LDFLAGS(LDFLAGS, LIBS)
 dnl   SANE_V4L_VERSION
 dnl   SANE_CHECK_PTAL
 dnl   SANE_CHECK_JPEG
+dnl   SANE_CHECK_IEEE1284
 dnl   JAPHAR_GREP_CFLAGS(flag, cmd_if_missing, cmd_if_present)
 dnl   SANE_LINKER_RPATH
 dnl   SANE_CHECK_U_TYPES
@@ -95,6 +96,19 @@ AC_DEFUN(SANE_CHECK_PTAL,
 	unset PTAL_OLD_LDFLAGS
 ])
 
+
+#
+# Checks for ieee1284 library, needed for canon_pp backend.
+AC_DEFUN(SANE_CHECK_IEEE1284,
+[
+  AC_CHECK_LIB(ieee1284, ieee1284_wait_status, [
+    AC_CHECK_HEADER(ieee1284.h,
+      [sane_cv_use_libieee1284="yes"; LIBS="${LIBS} -lieee1284"
+    ],)
+  ],)
+])
+
+
 #
 # Checks for jpeg library >= v6B (61), needed for DC210,  DC240, and 
 # GPHOTO2 backends.

aclocal.m4

@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p4
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -16,6 +16,7 @@ dnl   SANE_EXTRACT_LDFLAGS(LDFLAGS, LIBS)
 dnl   SANE_V4L_VERSION
 dnl   SANE_CHECK_PTAL
 dnl   SANE_CHECK_JPEG
+dnl   SANE_CHECK_IEEE1284
 dnl   JAPHAR_GREP_CFLAGS(flag, cmd_if_missing, cmd_if_present)
 dnl   SANE_LINKER_RPATH
 dnl   SANE_CHECK_U_TYPES
@@ -107,6 +108,19 @@ AC_DEFUN(SANE_CHECK_PTAL,
 	unset PTAL_OLD_LDFLAGS
 ])
 
+
+#
+# Checks for ieee1284 library, needed for canon_pp backend.
+AC_DEFUN(SANE_CHECK_IEEE1284,
+[
+  AC_CHECK_LIB(ieee1284, ieee1284_wait_status, [
+    AC_CHECK_HEADER(ieee1284.h,
+      [sane_cv_use_libieee1284="yes"; LIBS="${LIBS} -lieee1284"
+    ],)
+  ],)
+])
+
+
 #
 # Checks for jpeg library >= v6B (61), needed for DC210,  DC240, and 
 # GPHOTO2 backends.

configure.in

@@ -201,6 +201,8 @@ AC_CHECK_LIB(usb, usb_open)
 
 SANE_CHECK_JPEG
 
+SANE_CHECK_IEEE1284
+
 SANE_CHECK_GPHOTO2
 
 dnl IRIX sometimes has SYSVR3/4 network DSOs, but we do not need or want
@@ -257,6 +259,15 @@ AC_SUBST(DC210)
 AC_SUBST(DC240)
 AC_SUBST(DJPEG)
 
+if test "${sane_cv_use_libieee1284}" != "yes"
+then
+  echo "disabling CANON_PP backend (failed to find required libieee1284)"
+  CANON_PP=
+else
+  echo "enabling CANON_PP backend"
+  CANON_PP=canon_pp
+fi
+AC_SUBST(CANON_PP)
 
 if test "${HAVE_GPHOTO2}" != "gphoto2-config" \
       -o "${sane_cv_use_libjpeg}" != "yes"; then