diff -Nru sane-backends-extras-1.0.22.4build1/configure.ac sane-backends-extras-1.0.22.5/configure.ac --- sane-backends-extras-1.0.22.4build1/configure.ac 1970-01-01 00:00:00.000000000 +0000 +++ sane-backends-extras-1.0.22.5/configure.ac 2011-02-17 18:47:34.000000000 +0000 @@ -0,0 +1,788 @@ +dnl Process this file with autoconf to produce a configure script. -*-m4-*- + +dnl *********************************************************************** +dnl When preparing a release, increase the numeric and string version numbers, +dnl remove the "cvs" suffix, and set is_release=yes +AC_INIT([sane-backends],[1.0.22],[sane-devel@lists.alioth.debian.org]) +V_MAJOR=1 +V_MINOR=0 +V_REV=22 +is_release=yes +dnl *********************************************************************** + +m4_ifdef([AC_CONFIG_MACRO_DIR], [AC_CONFIG_MACRO_DIR([m4])]) + +AM_INIT_AUTOMAKE +dnl Turn off feature were automake will automatically run autoreconf. +dnl This is because we check in generated files into CVS which has +dnl known timestamp issues. +AM_MAINTAINER_MODE + +AC_CONFIG_HEADERS([include/sane/config.h]) +AC_PREREQ(2.54) dnl Minimum Autoconf version required. + +PACKAGE=AC_PACKAGE_NAME +VERSION=AC_PACKAGE_VERSION +NUMBER_VERSION=${V_MAJOR}.${V_MINOR}.${V_REV} +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", + [Define to the name of the distribution.]) +AC_DEFINE_UNQUOTED(VERSION, "$VERSION", + [Define to the version of the distribution.]) +AC_DEFINE_UNQUOTED(SANE_DLL_V_MAJOR, $V_MAJOR, [SANE DLL major number]) +AC_DEFINE_UNQUOTED(SANE_DLL_V_MINOR, $V_MINOR, [SANE DLL minor number]) +AC_DEFINE_UNQUOTED(SANE_DLL_V_BUILD, $V_REV, [SANE DLL revision number]) +AC_SUBST(V_MAJOR) +AC_SUBST(V_MINOR) +AC_SUBST(V_REV) +AC_SUBST(PACKAGE) +AC_SUBST(VERSION) +AC_SUBST(NUMBER_VERSION) +AC_CANONICAL_BUILD +AC_CANONICAL_HOST + +dnl no bloody way to have a decent --docdir... +AC_ARG_WITH(docdir, + AC_HELP_STRING([--with-docdir=DIR], + [documentation @<:@PREFIX/doc/sane-VERSION@:>@]), +[ + docdir="${withval}" + AC_SUBST([docdir])dnl +], [ + AC_SUBST([docdir], ['${prefix}/doc/sane-${VERSION}'])dnl +]) + +dnl *********************************************************************** +dnl Checks for programs. +dnl *********************************************************************** +AC_PROG_CC +AM_PROG_CC_C_O +AC_PROG_INSTALL +AC_PROG_MAKE_SET +AC_PROG_CPP +AC_PROG_GCC_TRADITIONAL +AC_PATH_PROG(SANE_CONFIG_PATH, sane-config, no) +AC_PATH_PROG(MSGFMT, msgfmt$EXEEXT, no) +AC_PATH_PROG(XGETTEXT, xgettext$EXEEXT, no) +AC_PATH_PROG(MSGMERGE, msgmerge$EXEEXT, no) +AC_PATH_PROG(LATEX, latex$EXEEXT, no) +AC_PATH_PROG(DVIPS, dvips$EXEEXT, no) +AC_PATH_PROG(MAKEINDEX, makeindex$EXEEXT, no) +AC_SUBST(MSGFMT) +AC_SUBST(XGETTEXT) +AC_SUBST(MSGMERGE) +AC_SUBST(LATEX) +AC_SUBST(DVIPS) +AC_SUBST(MAKEINDEX) + +dnl Call explicitely before using PKG_* +PKG_PROG_PKG_CONFIG + +AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes) + +dnl *********************************************************************** +dnl set compiler/linker flags +dnl *********************************************************************** +INCLUDES="${INCLUDES} -I/usr/local/include" +AC_SUBST(INCLUDES) +SANE_SET_CFLAGS([$is_release]) +SANE_SET_LDFLAGS +dnl SANE_LINKER_RPATH + +dnl *********************************************************************** +dnl Checks for unix variants +dnl *********************************************************************** +m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC_USE_SYSTEM_EXTENSIONS]) +m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[AC_GNU_SOURCE]) +m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[AC_AIX]) +m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[AC_MINIX]) +AC_ISC_POSIX + +AC_NEED_BYTEORDER_H([include/byteorder.h]) +AX_CREATE_STDINT_H([include/_stdint.h]) + +dnl *********************************************************************** +dnl Checks for libraries +dnl *********************************************************************** +SANE_CHECK_DLL_LIB +dnl Checks for Backend libraries. +AC_CHECK_LIB(m, sqrt, MATH_LIB="-lm") +AC_SUBST(MATH_LIB) +case ${host_os} in + os2*) + AC_CHECK_LIB(syslog, sylog, SYSLOG_LIBS="-lsyslog") + ;; + beos*) + AC_CHECK_LIB(be, syslog, SYSLOG_LIBS="-lbe") + ;; +esac +AC_SUBST(SYSLOG_LIBS) + +SANE_CHECK_JPEG +SANE_CHECK_TIFF +SANE_CHECK_IEEE1284 +SANE_CHECK_PTHREAD +SANE_CHECK_LOCKING +SANE_CHECK_GPHOTO2 + + +PKG_CHECK_MODULES(LIBV4L, libv4l1, have_libv4l1=yes, have_libv4l1=no) +AC_SUBST(LIBV4L_LIBS) +AC_SUBST(LIBV4L_CFLAGS) + +AC_ARG_ENABLE(avahi, + AC_HELP_STRING([--enable-avahi], [enable Avahi support for saned and the net backend]), + [enable_avahi=$enableval], [enable_avahi=no]) + +if test "$enable_avahi" = "yes"; then + PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6.24 ], + [AC_DEFINE(WITH_AVAHI, 1, [define if Avahi support is enabled for saned and the net backend])], enable_avahi=no) +fi + +dnl check sane to make sure we don't have two installations +AC_CHECK_LIB(sane, sane_init, LIBSANE_EXISTS="yes") + + +dnl ************************************************************** +dnl SNMP CHECKS +dnl ************************************************************** + +AC_ARG_WITH(snmp, + AC_HELP_STRING([--with-snmp], [enable SNMP support @<:@default=yes@:>@])) + +if test "$with_snmp" = "no"; then + echo "Not including SNMP support" +else + AC_PATH_PROG(SNMP_CONFIG_PATH, net-snmp-config, "no") + AC_CHECK_LIB([netsnmp], [snmp_timeout], LIBSNMP_EXISTS="yes") + AC_MSG_CHECKING(for proper SNMP version) + if test "$SNMP_CONFIG_PATH" != "no" ; then + snmp_version=`$SNMP_CONFIG_PATH --version 2>/dev/null` + vers=`echo $snmp_version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2);}'` + if test -n "$vers" && test "$vers" -ge 5006; then + SNMP_LIBS=`$SNMP_CONFIG_PATH --libs` + SNMP_CFLAGS=`$SNMP_CONFIG_PATH --cflags` + AC_MSG_RESULT(yes) + with_snmp="yes" + else + AC_MSG_RESULT(no) + AC_MSG_WARN([You need at least net-snmp 5.6, your version is $snmp_version]) + with_snmp="no" + fi + else + with_snmp="no" + AC_MSG_RESULT(no) + fi +fi + +if test "$with_snmp" = "yes"; then + LIBS="$LIBS $SNMP_LIBS" + CFLAGS="$CFLAGS $SNMP_CFLAGS" + AC_DEFINE(HAVE_LIBSNMP, 1, [Define to 1 if you have the net-snmp library.]) +else + AC_MSG_WARN([*** Warning: net-snmp library disabled, autodetecting network scanners will not be supported.]) +fi + + + + + +dnl *********************************************************************** +dnl Checks for header files. +dnl *********************************************************************** +AC_HEADER_STDC +AC_CHECK_HEADERS(fcntl.h unistd.h libc.h sys/dsreq.h sys/select.h \ + sys/time.h sys/shm.h sys/ipc.h sys/signal.h sys/scanio.h os2.h \ + sys/socket.h sys/io.h sys/hw.h sys/types.h linux/ppdev.h \ + dev/ppbus/ppi.h machine/cpufunc.h sys/bitypes.h sys/sem.h sys/poll.h \ + windows.h be/kernel/OS.h limits.h sys/ioctl.h asm/types.h\ + netinet/in.h tiffio.h ifaddrs.h pwd.h getopt.h) +AC_CHECK_HEADERS([asm/io.h],,,[#include ]) + +SANE_CHECK_MISSING_HEADERS + +AC_CHECK_HEADER(resmgr.h,[ + AC_CHECK_LIB( + resmgr, + rsm_open_device,[ + AC_DEFINE(HAVE_RESMGR,1,[define if you have the resmgr library]) + RESMGR_LIBS="-lresmgr" + ] + ) +]) +AC_SUBST(RESMGR_LIBS) + +dnl *********************************************************************** +dnl Checks for types and structures +dnl *********************************************************************** +AC_TYPE_SIGNAL +AC_TYPE_SIZE_T +AC_TYPE_PID_T +AC_CHECK_TYPE(ssize_t, long) +SANE_CHECK_U_TYPES + +# from Python, check for "long long" type +AC_MSG_CHECKING(for long long support) +have_long_long=no +AC_TRY_COMPILE([], [long long x; x = (long long)0;], AC_DEFINE(HAVE_LONG_LONG, 1, [Define if the long long type is available.]) have_long_long=yes) +AC_MSG_RESULT($have_long_long) + +AC_MSG_CHECKING([for socklen_t in ]) +AC_TRY_COMPILE([ +#include +],[socklen_t len],AC_MSG_RESULT(yes), +[AC_MSG_RESULT(no); AC_DEFINE(socklen_t,int, +[Define socklen_t as \'int\' if necessary.])]) + +AC_MSG_CHECKING([for union semun in ]) +AC_TRY_COMPILE([ +#include +#include +#include +],[union semun test_semun],[AC_MSG_RESULT(yes); +AC_DEFINE(HAVE_UNION_SEMUN,1,[Define if union semun is available.])], +AC_MSG_RESULT(no)) + +AC_MSG_CHECKING([for struct flock in fcntl.h]) +AC_EGREP_HEADER([struct flock], fcntl.h, [AC_MSG_RESULT(yes) ; + AC_DEFINE(HAVE_STRUCT_FLOCK, 1, + [Define if struct flock is available.])], AC_MSG_RESULT(no)) + +AC_MSG_CHECKING([for Linux ioctl defines]) +AC_TRY_COMPILE([ +#include +#include +],[ +__u32 houba = _IOR('v',14, unsigned long); +],[AC_MSG_RESULT(yes); +have_linux_ioctl_defines="yes";],AC_MSG_RESULT(no)) + +dnl *********************************************************************** +dnl Checks for compiler characteristics +dnl *********************************************************************** +AC_C_BIGENDIAN +AC_C_CONST +AC_C_INLINE + +dnl *********************************************************************** +dnl Checks for library functions +dnl *********************************************************************** + +dnl Define SOCKET_LIB, NSL_LIB, BIND_LIB, and RESOLV_LIB when required +dnl for functions we use. +AC_CHECK_FUNC(gethostbyaddr,, [AC_CHECK_LIB(bind, gethostbyaddr, BIND_LIB="-lbind")]) +AC_CHECK_FUNC(gethostbyaddr,, [AC_CHECK_LIB(nsl, gethostbyaddr, NSL_LIB="-lnsl")]) +AC_CHECK_FUNC(socket, [SOCKET_LIBS=], [AC_CHECK_LIB(socket, socket, SOCKET_LIB="-lsocket")]) +AC_CHECK_FUNC(inet_aton,, [AC_CHECK_LIB(resolv, inet_aton, RESOLV_LIB="-lresolv")]) + +dnl Group related network libraries together so they can always be linked +dnl in. +SOCKET_LIBS="$SOCKET_LIB $NSL_LIB $BIND_LIB $RESOLV_LIB" +AC_SUBST(SOCKET_LIBS) + +dnl define HAVE_* values for network functions. This may require +dnl SOCKET_LIBS so set LIBS temporarily. +save_LIBS="$LIBS" +LIBS="$LIBS $SOCKET_LIBS" +AC_CHECK_FUNCS(inet_addr inet_aton inet_ntoa) +AC_REPLACE_FUNCS(inet_ntop inet_pton) +LIBS="$save_LIBS" + +if test "$ac_cv_header_be_kernel_OS_h" = "yes" ; then + dnl those are known to be broken in BeOS (BONE) + ac_cv_func_getaddrinfo=no + ac_cv_func_getnameinfo=no +fi + +AC_FUNC_ALLOCA +AC_FUNC_MMAP +AC_CHECK_FUNCS(atexit ioperm i386_set_ioperm \ + mkdir strftime strstr strtod \ + cfmakeraw tcsendbreak strcasecmp strncasecmp _portaccess \ + getaddrinfo getnameinfo poll setitimer iopl ) +AC_REPLACE_FUNCS(getenv isfdtype sigprocmask snprintf \ + strcasestr strdup strndup strsep usleep vsyslog) + +SANE_PROTOTYPES + +if test "$ac_cv_header_os2_h" = "yes" ; then + AC_DEFINE(strncasecmp, strnicmp, [Define for OS/2 only]) + AC_DEFINE(strcasecmp, stricmp, [Define for OS/2 only]) +fi + +if test "$ac_cv_header_getopt_h" = "yes" ; then + AC_CHECK_FUNCS(getopt_long) +fi + +dnl *********************************************************************** +dnl checks for system services +dnl *********************************************************************** +if test -c /dev/urandom ; then + AC_DEFINE(HAVE_DEV_URANDOM, 1, [Is /dev/urandom available?]) +fi + +dnl *********** +dnl USB Support +dnl *********** + +dnl Enable libusb-1.0, if available +AC_ARG_ENABLE(libusb_1_0, + AC_HELP_STRING([--enable-libusb_1_0], [enable libusb-1.0 support if available]), + [enable_libusb_1_0=$enableval], [enable_libusb_1_0=no]) + +dnl USB support enabled by default (if found). Note: Overloading libusb +dnl option right now to disable USB support on any platform; even +dnl if they use a different library name. +AC_ARG_ENABLE(libusb, + AC_HELP_STRING([--disable-libusb], [disable support for USB in SANE]),, + enable_libusb=auto) +HAVE_USB=no +if test "$enable_libusb" != "no"; then + case ${host_os} in + beos*) + AC_CHECK_HEADERS(be/drivers/USB_scanner.h, HAVE_USB=yes, AC_MSG_ERROR([USB_scanner.h is required on BeOS])) + ;; + os2*) + AC_CHECK_HEADER(usbcalls.h, + AC_CHECK_LIB(usbcall, UsbQueryNumberDevices, + [USB_LIBS="$USB_LIBS -lusbcall" + HAVE_USB=yes]),,[#include +#include +]) + ;; + *) + dnl If libusb-1.0 is enabled and available, prefer that to the old libusb + have_libusb_1_0=no + if test "$enable_libusb_1_0" = "yes"; then + PKG_CHECK_MODULES(LIBUSB_1_0, [ libusb-1.0 >= 1.0.0 ], have_libusb_1_0=yes, have_libusb_1_0=no) + if test "$have_libusb_1_0" = "yes"; then + CFLAGS="$CFLAGS $LIBUSB_1_0_CFLAGS" + USB_LIBS="$USB_LIBS $LIBUSB_1_0_LIBS" + HAVE_USB=yes + fi + fi + + if test "$have_libusb_1_0" = "no"; then + dnl Fallback to the old libusb + dnl libusb >= 0.1.8 is required, as we need usb_interrupt_read() + AC_CHECK_HEADER(usb.h, + AC_CHECK_LIB(usb, usb_interrupt_read, + [USB_LIBS="$USB_LIBS -lusb" + HAVE_USB=yes])) + fi + ;; + esac +fi +dnl The following logic is useful for distributions. If they force +dnl USB support with --enable-libusb=yes then configure will fail +dnl when its detected that it can not be supported. Default is +dnl "auto" which means only enable if libraries are found and do +dnl not error out. +if test "$enable_libusb" = "yes" && test "$HAVE_USB" = "no"; then + AC_MSG_ERROR([USB support requested but required libraries not found.]) +fi +if test "$HAVE_USB" = "yes"; then + case ${host_os} in + os2*) + AC_DEFINE(HAVE_USBCALL, 1, [Define to 1 if you have usbcall.dll.]) + ;; + *) + if test "$have_libusb_1_0" = "yes"; then + AC_DEFINE(HAVE_LIBUSB_1_0, 1, [Define to 1 if you have libusb-1.0.]) + else + AC_DEFINE(HAVE_LIBUSB, 1, [Define to 1 if you have libusb.]) + fi + ;; + esac +fi +AC_SUBST(USB_LIBS) + +dnl ************ +dnl SCSI Support +dnl ************ + +dnl FIXME: These are a lot of header files to scan. We should +dnl scan for just one that is unique per platform and then do +dnl conditional scans for more specific only as needed. +AC_CHECK_HEADERS(IOKit/scsi/SCSITaskLib.h IOKit/cdb/IOSCSILib.h \ + IOKit/scsi/SCSICommandOperationCodes.h \ + IOKit/scsi-commands/SCSICommandOperationCodes.h scsi.h sys/scsi.h \ + sys/scsicmd.h sys/scsiio.h bsd/dev/scsireg.h scsi/sg.h \ + camlib.h scdds.h sys/scsi/scsi.h sys/scsi/sgdefs.h \ + sys/scsi/targets/scgio.h apollo/scsi.h sys/sdi_comm.h \ + sys/passthrudef.h) +AC_CHECK_HEADERS([io/cam/cam.h],,,[#include ]) + +dnl FreeBSD < 3 +if test "$ac_cv_header_sys_scsiio_h" = "yes" \ + -a "$ac_cv_header_scsi_h" = "yes"; then + AC_MSG_CHECKING([if 'scsireq_t' needs to be defined as 'struct scsireq']) + AC_TRY_COMPILE([ +#include +#include +],[scsireq_t req],, + [AC_MSG_RESULT(yes); + AC_DEFINE(scsireq_t, struct scsireq_t, + [Define scsireq_t as \'struct scsireq\' if necessary.])], + AC_MSG_RESULT(no)) +fi +AC_CHECK_LIB(scsi, scsireq_enter, SCSI_LIBS="-lscsi") # FreeBSD needs this + +dnl FreeBSD >= 3 +AC_CHECK_LIB(cam, cam_open_device, SCSI_LIBS="-lcam") # FreeBSD 3+ needs this + +AC_CHECK_FUNCS(scsireq_enter) + +if test "$ac_cv_header_scsi_sg_h" = "yes"; then + AC_MSG_CHECKING([for sg_header.target_status in ]) + AC_TRY_COMPILE([ +#include +#include +],[ +struct sg_header hdr; +hdr.target_status = 1; +return 0; +],[AC_MSG_RESULT(yes); + AC_DEFINE(HAVE_SG_TARGET_STATUS,1, + [Define if sg_header.target_status is available.])], + AC_MSG_RESULT(no)) +fi + +if test "$ac_cv_header_IOKit_scsi_SCSITaskLib_h" = "yes"; then + AC_MSG_CHECKING([for SCSITaskSGElement in IOKit/scsi/SCSITaskLib.h]) + AC_TRY_COMPILE([ +#undef VERSION +#include +],[ +SCSITaskSGElement range; +return 0; +],[AC_MSG_RESULT(yes); + AC_DEFINE(HAVE_SCSITASKSGELEMENT, 1, + [Define if SCSITaskSGElement is available.])], + AC_MSG_RESULT(no)) +fi + +dnl disable Linux SCSI generic version 3 to avoid 32/64 bit problems +if sparc64 -q > /dev/null 2>&1 ; then + AC_DEFINE(DISABLE_LINUX_SG_IO, 1, [Should we disable SCSI generic v3?]) +fi + +# Multiple platforms can set SCSI_LIBS so do substitution at end. +AC_SUBST(SCSI_LIBS) + +AC_ARG_ENABLE(scsibuffersize, + AC_HELP_STRING([--enable-scsibuffersize=N], + [specify the default size in bytes of the buffer for SCSI + commands [[default=131072]]]), + [set_scsibuffersize="$enableval"], [set_scsibuffersize=131072]) +AC_DEFINE_UNQUOTED(SCSIBUFFERSIZE, $set_scsibuffersize, + [SCSI command buffer size]) +dnl FIXME: Move tihs to configuration printout area but probably +dnl but probably needs to be wrapped by what ever uses it so its +dnl only printed when used. +echo "scsi buffersize: $set_scsibuffersize" + +AC_ARG_ENABLE(scsi-directio, + AC_HELP_STRING([--enable-scsi-directio], + [enable SCSI direct IO (Linux only, dangerous, see + README.linux)]), + [ + if eval "test x$enable_scsi_directio = xyes"; then + CFLAGS="$CFLAGS -DENABLE_SCSI_DIRECTIO" + fi + ]) + +dnl **** +dnl IPv6 +dnl **** + +dnl check for IPv6 (can be overriden by --enable-ipv6) +if test "$ac_cv_func_getnameinfo" = "yes" \ + && test "$ac_cv_func_getaddrinfo" = "yes" ; then + SANE_CHECK_IPV6 +else + ipv6="no" +fi + +dnl *********************************************************************** +dnl initialize libtool +dnl *********************************************************************** +AC_LIBTOOL_WIN32_DLL +AC_DISABLE_STATIC +AC_PROG_LIBTOOL + +dnl Windows (cygwin/mingw), BeOS, and OS/2 need this. +case $host_os in + cygwin* | mingw* | beos* | os2*) + LDFLAGS="$LDFLAGS -no-undefined" +esac + +dnl Check for lock dir + +AC_ARG_WITH(lockdir, AC_HELP_STRING([--with-lockdir=DIR], + [set SANE lockdir @<:@localstatedir/lock/sane@:>@]), + [locksanedir=$withval],[locksanedir=${localstatedir}/lock/sane]) +AC_SUBST(locksanedir) + +configdir="${sysconfdir}/sane.d" +AC_SUBST(configdir) + +dnl *********************************************************************** +dnl enable/disable backends and features based on previous tests and user's +dnl choice +dnl *********************************************************************** + +CPPFLAGS="${CPPFLAGS} -DPATH_SANE_CONFIG_DIR=\$(configdir) \ + -DPATH_SANE_DATA_DIR=\$(datadir) \ + -DPATH_SANE_LOCK_DIR=\$(locksanedir) \ + -DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR}" + +if test "${ac_cv_header_sys_socket_h}" = "no"; then + echo "*** disabling saned (sys/socket.h not found)" + SANED= +else + SANED=saned +fi +AM_CONDITIONAL(COMPILE_SANED, test x$SANED = xsaned) + +dnl These are the backends that are build in any case: + +AC_ARG_ENABLE(local-backends, + AC_HELP_STRING([--disable-local-backends], + [turn off compilation of all backends but net])) + +ALL_BACKENDS="geniusvp2 ls5000" + +# If user specifies backends manually then cause configure +# to fail if its detected it can't be compiled. If we +# are in automatic mode then remove backend from list instead. +user_selected_backends="yes" + +if eval "test x$enable_local_backends = xno"; then + BACKENDS="net" +else + if test "${BACKENDS}" != "" ; then + AC_MSG_NOTICE([Manually selected backends: ${BACKENDS}]) + else + BACKENDS="$ALL_BACKENDS" + user_selected_backends="no" + fi +fi + +SANE_CHECK_BACKENDS + +if test "${sane_cv_use_libjpeg}" = "yes"; then + SANEI_SANEI_JPEG_LO="../sanei/sanei_jpeg.lo" +fi +AM_CONDITIONAL(HAVE_JPEG, test x$sane_cv_use_libjpeg = xyes) +AC_SUBST(SANEI_SANEI_JPEG_LO) + +BACKENDS="$FILTERED_BACKENDS" +BACKEND_LIBS_ENABLED="" +BACKEND_CONFS_ENABLED="" +BACKEND_MANS_ENABLED="" +for backend in ${BACKENDS} ; do + BACKEND_LIBS_ENABLED="${BACKEND_LIBS_ENABLED} libsane-${backend}.la" + BACKEND_CONFS_ENABLED="${BACKEND_CONFS_ENABLED} ${backend}.conf" + BACKEND_MANS_ENABLED="${BACKEND_MANS_ENABLED} sane-${backend}.5" +done +AC_SUBST(BACKEND_LIBS_ENABLED) + +if test "${enable_shared}" = "no"; then + enable_preload=yes +fi +if test "${enable_dynamic}" != yes || test "${enable_preload}" = "yes"; then + echo "preloading backends into DLL" + + # If user specifies backends manually then cause configure + # to fail if its detected it can't be compiled. If we + # are in automatic mode then remove backend from list instead. + user_selected_backends="yes" + + if eval "test x$enable_local_backends = xno"; then + PRELOADABLE_BACKENDS="net" + else + if test "${PRELOADABLE_BACKENDS}" != "" ; then + AC_MSG_NOTICE([Manually selected preloadable backends: ${PRELOADABLE_BACKENDS}]) + else + PRELOADABLE_BACKENDS="$ALL_BACKENDS" + user_selected_backends="no" + fi + fi + + saved_BACKENDS="$BACKENDS" + BACKENDS="${PRELOADABLE_BACKENDS}" + + SANE_CHECK_BACKENDS + + PRELOADABLE_BACKENDS="$FILTERED_BACKENDS" + BACKENDS="$saved_BACKENDS" +else + PRELOADABLE_BACKENDS="" +fi +PRELOADABLE_BACKENDS_ENABLED="" +# Do not initialize BACKEND_CONFS_ENABLED so that its a combination +# of all backends. +for backend in ${PRELOADABLE_BACKENDS} ; do + BACKEND_CONFS_ENABLED="${BACKEND_CONFS_ENABLED} ${backend}.conf" + BACKEND_MANS_ENABLED="${BACKEND_MANS_ENABLED} sane-${backend}.5" + # Special hacks. Normally, we create a convenience library that + # matches the backend's name but in some cases that will conflict + # with an external library name that also matches backend name. + # Work around that here by renaming internal library. + if test "${backend}" = "gphoto2"; then + backend=gphoto2_i + fi + PRELOADABLE_BACKENDS_ENABLED="${PRELOADABLE_BACKENDS_ENABLED} lib${backend}.la" +done + +AC_SUBST(PRELOADABLE_BACKENDS) +AC_SUBST(PRELOADABLE_BACKENDS_ENABLED) +AC_SUBST(BACKEND_CONFS_ENABLED) +AC_SUBST(BACKEND_MANS_ENABLED) + +dnl in BeOS, backends are not installed in lib/sane, but add-ons/sane/ +dnl we account for both installing in /boot/beos and ~/config +case $host_os in + beos*) + libdir='${exec_prefix}/add-ons' + ;; +esac + +AC_ARG_ENABLE(parport-directio, + AC_HELP_STRING([--enable-parport-directio], + [enable direct hardware access to the parallel port, so + frontends will require special permission level]), + [ + if eval "test x$enable_parport_directio = xyes"; then + CFLAGS="$CFLAGS -DENABLE_PARPORT_DIRECTIO" + fi + ]) + +AC_ARG_ENABLE(translations, + AC_HELP_STRING([--disable-translations], + [don't install translations of backend options]),, + enable_translations=yes) +if eval "test x$enable_translations = xyes" ; then + if test x$MSGFMT = xno || test x$XGETTEXT = xno || test $MSGMERGE = no ; then + enable_translations=no + echo "disabling translations (missing msgfmt, xgettext or msgmerge)" + else + echo "enabling translations" + fi +else + echo "disabling translations" +fi +AM_CONDITIONAL(ENABLE_TRANSLATIONS, test x$enable_translations = xyes) + +AC_ARG_ENABLE(latex, + AC_HELP_STRING([--disable-latex], + [disable use of latex, et.al., to generate documentation]),, + enable_latex=yes) +if test "x$enable_latex" = "xyes" ; then + if test "x$LATEX" = "xno" || test "x$DVIPS" = "xno" || test "x$MAKEINDEX" = "xno" ; then + enable_latex=no + echo "disabling latex (missing latex, dvips or makeindex)" + else + echo "enabling latex" + fi +else + echo "disabling latex" +fi +AM_CONDITIONAL(USE_LATEX, test x$enable_latex = xyes) + +dnl *********************************************************************** +dnl Write output files +dnl *********************************************************************** + +DISTCLEAN_FILES="*~ .*~ *.log *.bak *.old *.orig *.out *.rej \"\#\"* \".\\#\"*" +AC_SUBST(DISTCLEAN_FILES) + +AC_CONFIG_FILES([Makefile lib/Makefile sanei/Makefile \ + backend/Makefile include/Makefile doc/Makefile]) +AC_OUTPUT + +dnl *********************************************************************** +dnl print configuration information +dnl *********************************************************************** + +echo "-> Variables used for compilation/linking:" +echo CPPFLAGS=\"${CPPFLAGS}\" +echo CFLAGS=\"${CFLAGS}\" +echo LDFLAGS=\"${LDFLAGS}\" +echo LIBS=\"${LIBS}\" +echo "-> Installation directories:" +echo "Configuration: `eval eval echo ${sysconfdir}`" +echo "Libraries: `eval eval echo ${libdir}`" +echo "Binaries: `eval eval echo ${bindir}` and `eval eval echo ${sbindir}`" +echo "Manpages: `eval eval echo ${mandir}`" +echo "Documentation: `eval eval echo ${docdir}`" +if eval "test x$INSTALL_LOCKPATH = xinstall-lockpath" ; then + echo "Lockfiles: `eval eval echo ${locksanedir}`" +else + echo "Lockfiles: Feature is disabled!" +fi +echo "-> Network parameters:" +if test "${SANED}" = "saned" ; then + echo "Build saned: yes" +else + echo "Build saned: no" +fi +echo "IPv6 support: `eval eval echo ${ipv6}`" +echo "Avahi support: `eval eval echo ${enable_avahi}`" +echo "SNMP support: `eval eval echo ${with_snmp}`" +echo "-> The following backends will be built:" +for backend in ${BACKENDS} ; do + echo $ECHO_N "${backend} " +done +echo +echo +echo "-> The following preload backends will be built:" +for backend in ${PRELOADABLE_BACKENDS} ; do + echo $ECHO_N "${backend} " +done +echo + +if test "$SANE_CONFIG_PATH" != "no" ; then + SANE_INSTALLED_VERSION=`$SANE_CONFIG_PATH --version` + SANE_INSTALLED_PREFIX=`$SANE_CONFIG_PATH --prefix` + if test "$SANE_INSTALLED_PREFIX" != "$prefix" ; then + echo "*** WARNING: SANE is already installed (version $SANE_INSTALLED_VERSION). The old" + echo "*** installation is at $SANE_INSTALLED_PREFIX while SANE will now be installed" + echo "*** at $prefix. It is recommended to uninstall the old SANE version" + echo "*** before installing the new one to avoid problems." + fi +else + if test "$LIBSANE_EXISTS" = "yes" ; then + echo "*** Warning: An old version of SANE was detected but the sane-config program" + echo "*** couldn't be found. If you encounter any problems with SANE remove the old" + echo "*** SANE files and reinstall this version." + fi +fi +if eval "test x${sysconfdir} = x/usr/etc" ; then + echo "*** WARNING: Configuration files are stored in /usr/etc. If this is not" + echo "*** intended, use --sysconfdir to set another path (e.g. "/etc")." +fi +if test "$SELECTED_BACKENDS" != "" ; then + echo "*** Warning: Local backends have been disabled. This means that scanners" + echo "*** connected to your local computer won't be supported. Only a network" + echo "*** connection to a remote host is possible." +fi +if test "$enable_libusb" != "no" && test "$HAVE_USB" != "yes" ; then + echo "*** Warning: sane-backends will be built without libusb support. There may" + echo "*** be valid reasons to do so, e.g. if you don't use USB scanners or on" + echo "*** platforms without libusb support but generally this means that you" + echo "*** can't use USB devices with SANE. The most probable cause is that" + if test "${ac_cv_header_usb_h}" != "yes"; then + echo "*** the libusb header file usb.h is not installed. If you use Linux" + echo "*** you may need a package called 'libusb-dev', 'libusb-devel' or similar." + else + echo "*** libusb is not installed at all or is too old. See README." + fi +fi + +echo "****************************************************************" +echo "* Please be sure to read file PROBLEMS in this directory *" +echo "* BEFORE running any of the SANE applications. Some devices *" +echo "* may be damaged by improper operation, so please do heed this *" +echo "* advice. *" +echo "****************************************************************" diff -Nru sane-backends-extras-1.0.22.4build1/configure.in sane-backends-extras-1.0.22.5/configure.in --- sane-backends-extras-1.0.22.4build1/configure.in 2011-02-17 18:47:34.000000000 +0000 +++ sane-backends-extras-1.0.22.5/configure.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,788 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -*-m4-*- - -dnl *********************************************************************** -dnl When preparing a release, increase the numeric and string version numbers, -dnl remove the "cvs" suffix, and set is_release=yes -AC_INIT([sane-backends],[1.0.22],[sane-devel@lists.alioth.debian.org]) -V_MAJOR=1 -V_MINOR=0 -V_REV=22 -is_release=yes -dnl *********************************************************************** - -m4_ifdef([AC_CONFIG_MACRO_DIR], [AC_CONFIG_MACRO_DIR([m4])]) - -AM_INIT_AUTOMAKE -dnl Turn off feature were automake will automatically run autoreconf. -dnl This is because we check in generated files into CVS which has -dnl known timestamp issues. -AM_MAINTAINER_MODE - -AC_CONFIG_HEADERS([include/sane/config.h]) -AC_PREREQ(2.54) dnl Minimum Autoconf version required. - -PACKAGE=AC_PACKAGE_NAME -VERSION=AC_PACKAGE_VERSION -NUMBER_VERSION=${V_MAJOR}.${V_MINOR}.${V_REV} -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", - [Define to the name of the distribution.]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", - [Define to the version of the distribution.]) -AC_DEFINE_UNQUOTED(SANE_DLL_V_MAJOR, $V_MAJOR, [SANE DLL major number]) -AC_DEFINE_UNQUOTED(SANE_DLL_V_MINOR, $V_MINOR, [SANE DLL minor number]) -AC_DEFINE_UNQUOTED(SANE_DLL_V_BUILD, $V_REV, [SANE DLL revision number]) -AC_SUBST(V_MAJOR) -AC_SUBST(V_MINOR) -AC_SUBST(V_REV) -AC_SUBST(PACKAGE) -AC_SUBST(VERSION) -AC_SUBST(NUMBER_VERSION) -AC_CANONICAL_BUILD -AC_CANONICAL_HOST - -dnl no bloody way to have a decent --docdir... -AC_ARG_WITH(docdir, - AC_HELP_STRING([--with-docdir=DIR], - [documentation @<:@PREFIX/doc/sane-VERSION@:>@]), -[ - docdir="${withval}" - AC_SUBST([docdir])dnl -], [ - AC_SUBST([docdir], ['${prefix}/doc/sane-${VERSION}'])dnl -]) - -dnl *********************************************************************** -dnl Checks for programs. -dnl *********************************************************************** -AC_PROG_CC -AM_PROG_CC_C_O -AC_PROG_INSTALL -AC_PROG_MAKE_SET -AC_PROG_CPP -AC_PROG_GCC_TRADITIONAL -AC_PATH_PROG(SANE_CONFIG_PATH, sane-config, no) -AC_PATH_PROG(MSGFMT, msgfmt$EXEEXT, no) -AC_PATH_PROG(XGETTEXT, xgettext$EXEEXT, no) -AC_PATH_PROG(MSGMERGE, msgmerge$EXEEXT, no) -AC_PATH_PROG(LATEX, latex$EXEEXT, no) -AC_PATH_PROG(DVIPS, dvips$EXEEXT, no) -AC_PATH_PROG(MAKEINDEX, makeindex$EXEEXT, no) -AC_SUBST(MSGFMT) -AC_SUBST(XGETTEXT) -AC_SUBST(MSGMERGE) -AC_SUBST(LATEX) -AC_SUBST(DVIPS) -AC_SUBST(MAKEINDEX) - -dnl Call explicitely before using PKG_* -PKG_PROG_PKG_CONFIG - -AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes) - -dnl *********************************************************************** -dnl set compiler/linker flags -dnl *********************************************************************** -INCLUDES="${INCLUDES} -I/usr/local/include" -AC_SUBST(INCLUDES) -SANE_SET_CFLAGS([$is_release]) -SANE_SET_LDFLAGS -dnl SANE_LINKER_RPATH - -dnl *********************************************************************** -dnl Checks for unix variants -dnl *********************************************************************** -m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC_USE_SYSTEM_EXTENSIONS]) -m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[AC_GNU_SOURCE]) -m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[AC_AIX]) -m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[AC_MINIX]) -AC_ISC_POSIX - -AC_NEED_BYTEORDER_H([include/byteorder.h]) -AX_CREATE_STDINT_H([include/_stdint.h]) - -dnl *********************************************************************** -dnl Checks for libraries -dnl *********************************************************************** -SANE_CHECK_DLL_LIB -dnl Checks for Backend libraries. -AC_CHECK_LIB(m, sqrt, MATH_LIB="-lm") -AC_SUBST(MATH_LIB) -case ${host_os} in - os2*) - AC_CHECK_LIB(syslog, sylog, SYSLOG_LIBS="-lsyslog") - ;; - beos*) - AC_CHECK_LIB(be, syslog, SYSLOG_LIBS="-lbe") - ;; -esac -AC_SUBST(SYSLOG_LIBS) - -SANE_CHECK_JPEG -SANE_CHECK_TIFF -SANE_CHECK_IEEE1284 -SANE_CHECK_PTHREAD -SANE_CHECK_LOCKING -SANE_CHECK_GPHOTO2 - - -PKG_CHECK_MODULES(LIBV4L, libv4l1, have_libv4l1=yes, have_libv4l1=no) -AC_SUBST(LIBV4L_LIBS) -AC_SUBST(LIBV4L_CFLAGS) - -AC_ARG_ENABLE(avahi, - AC_HELP_STRING([--enable-avahi], [enable Avahi support for saned and the net backend]), - [enable_avahi=$enableval], [enable_avahi=no]) - -if test "$enable_avahi" = "yes"; then - PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6.24 ], - [AC_DEFINE(WITH_AVAHI, 1, [define if Avahi support is enabled for saned and the net backend])], enable_avahi=no) -fi - -dnl check sane to make sure we don't have two installations -AC_CHECK_LIB(sane, sane_init, LIBSANE_EXISTS="yes") - - -dnl ************************************************************** -dnl SNMP CHECKS -dnl ************************************************************** - -AC_ARG_WITH(snmp, - AC_HELP_STRING([--with-snmp], [enable SNMP support @<:@default=yes@:>@])) - -if test "$with_snmp" = "no"; then - echo "Not including SNMP support" -else - AC_PATH_PROG(SNMP_CONFIG_PATH, net-snmp-config, "no") - AC_CHECK_LIB([netsnmp], [snmp_timeout], LIBSNMP_EXISTS="yes") - AC_MSG_CHECKING(for proper SNMP version) - if test "$SNMP_CONFIG_PATH" != "no" ; then - snmp_version=`$SNMP_CONFIG_PATH --version 2>/dev/null` - vers=`echo $snmp_version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2);}'` - if test -n "$vers" && test "$vers" -ge 5006; then - SNMP_LIBS=`$SNMP_CONFIG_PATH --libs` - SNMP_CFLAGS=`$SNMP_CONFIG_PATH --cflags` - AC_MSG_RESULT(yes) - with_snmp="yes" - else - AC_MSG_RESULT(no) - AC_MSG_WARN([You need at least net-snmp 5.6, your version is $snmp_version]) - with_snmp="no" - fi - else - with_snmp="no" - AC_MSG_RESULT(no) - fi -fi - -if test "$with_snmp" = "yes"; then - LIBS="$LIBS $SNMP_LIBS" - CFLAGS="$CFLAGS $SNMP_CFLAGS" - AC_DEFINE(HAVE_LIBSNMP, 1, [Define to 1 if you have the net-snmp library.]) -else - AC_MSG_WARN([*** Warning: net-snmp library disabled, autodetecting network scanners will not be supported.]) -fi - - - - - -dnl *********************************************************************** -dnl Checks for header files. -dnl *********************************************************************** -AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h unistd.h libc.h sys/dsreq.h sys/select.h \ - sys/time.h sys/shm.h sys/ipc.h sys/signal.h sys/scanio.h os2.h \ - sys/socket.h sys/io.h sys/hw.h sys/types.h linux/ppdev.h \ - dev/ppbus/ppi.h machine/cpufunc.h sys/bitypes.h sys/sem.h sys/poll.h \ - windows.h be/kernel/OS.h limits.h sys/ioctl.h asm/types.h\ - netinet/in.h tiffio.h ifaddrs.h pwd.h getopt.h) -AC_CHECK_HEADERS([asm/io.h],,,[#include ]) - -SANE_CHECK_MISSING_HEADERS - -AC_CHECK_HEADER(resmgr.h,[ - AC_CHECK_LIB( - resmgr, - rsm_open_device,[ - AC_DEFINE(HAVE_RESMGR,1,[define if you have the resmgr library]) - RESMGR_LIBS="-lresmgr" - ] - ) -]) -AC_SUBST(RESMGR_LIBS) - -dnl *********************************************************************** -dnl Checks for types and structures -dnl *********************************************************************** -AC_TYPE_SIGNAL -AC_TYPE_SIZE_T -AC_TYPE_PID_T -AC_CHECK_TYPE(ssize_t, long) -SANE_CHECK_U_TYPES - -# from Python, check for "long long" type -AC_MSG_CHECKING(for long long support) -have_long_long=no -AC_TRY_COMPILE([], [long long x; x = (long long)0;], AC_DEFINE(HAVE_LONG_LONG, 1, [Define if the long long type is available.]) have_long_long=yes) -AC_MSG_RESULT($have_long_long) - -AC_MSG_CHECKING([for socklen_t in ]) -AC_TRY_COMPILE([ -#include -],[socklen_t len],AC_MSG_RESULT(yes), -[AC_MSG_RESULT(no); AC_DEFINE(socklen_t,int, -[Define socklen_t as \'int\' if necessary.])]) - -AC_MSG_CHECKING([for union semun in ]) -AC_TRY_COMPILE([ -#include -#include -#include -],[union semun test_semun],[AC_MSG_RESULT(yes); -AC_DEFINE(HAVE_UNION_SEMUN,1,[Define if union semun is available.])], -AC_MSG_RESULT(no)) - -AC_MSG_CHECKING([for struct flock in fcntl.h]) -AC_EGREP_HEADER([struct flock], fcntl.h, [AC_MSG_RESULT(yes) ; - AC_DEFINE(HAVE_STRUCT_FLOCK, 1, - [Define if struct flock is available.])], AC_MSG_RESULT(no)) - -AC_MSG_CHECKING([for Linux ioctl defines]) -AC_TRY_COMPILE([ -#include -#include -],[ -__u32 houba = _IOR('v',14, unsigned long); -],[AC_MSG_RESULT(yes); -have_linux_ioctl_defines="yes";],AC_MSG_RESULT(no)) - -dnl *********************************************************************** -dnl Checks for compiler characteristics -dnl *********************************************************************** -AC_C_BIGENDIAN -AC_C_CONST -AC_C_INLINE - -dnl *********************************************************************** -dnl Checks for library functions -dnl *********************************************************************** - -dnl Define SOCKET_LIB, NSL_LIB, BIND_LIB, and RESOLV_LIB when required -dnl for functions we use. -AC_CHECK_FUNC(gethostbyaddr,, [AC_CHECK_LIB(bind, gethostbyaddr, BIND_LIB="-lbind")]) -AC_CHECK_FUNC(gethostbyaddr,, [AC_CHECK_LIB(nsl, gethostbyaddr, NSL_LIB="-lnsl")]) -AC_CHECK_FUNC(socket, [SOCKET_LIBS=], [AC_CHECK_LIB(socket, socket, SOCKET_LIB="-lsocket")]) -AC_CHECK_FUNC(inet_aton,, [AC_CHECK_LIB(resolv, inet_aton, RESOLV_LIB="-lresolv")]) - -dnl Group related network libraries together so they can always be linked -dnl in. -SOCKET_LIBS="$SOCKET_LIB $NSL_LIB $BIND_LIB $RESOLV_LIB" -AC_SUBST(SOCKET_LIBS) - -dnl define HAVE_* values for network functions. This may require -dnl SOCKET_LIBS so set LIBS temporarily. -save_LIBS="$LIBS" -LIBS="$LIBS $SOCKET_LIBS" -AC_CHECK_FUNCS(inet_addr inet_aton inet_ntoa) -AC_REPLACE_FUNCS(inet_ntop inet_pton) -LIBS="$save_LIBS" - -if test "$ac_cv_header_be_kernel_OS_h" = "yes" ; then - dnl those are known to be broken in BeOS (BONE) - ac_cv_func_getaddrinfo=no - ac_cv_func_getnameinfo=no -fi - -AC_FUNC_ALLOCA -AC_FUNC_MMAP -AC_CHECK_FUNCS(atexit ioperm i386_set_ioperm \ - mkdir strftime strstr strtod \ - cfmakeraw tcsendbreak strcasecmp strncasecmp _portaccess \ - getaddrinfo getnameinfo poll setitimer iopl ) -AC_REPLACE_FUNCS(getenv isfdtype sigprocmask snprintf \ - strcasestr strdup strndup strsep usleep vsyslog) - -SANE_PROTOTYPES - -if test "$ac_cv_header_os2_h" = "yes" ; then - AC_DEFINE(strncasecmp, strnicmp, [Define for OS/2 only]) - AC_DEFINE(strcasecmp, stricmp, [Define for OS/2 only]) -fi - -if test "$ac_cv_header_getopt_h" = "yes" ; then - AC_CHECK_FUNCS(getopt_long) -fi - -dnl *********************************************************************** -dnl checks for system services -dnl *********************************************************************** -if test -c /dev/urandom ; then - AC_DEFINE(HAVE_DEV_URANDOM, 1, [Is /dev/urandom available?]) -fi - -dnl *********** -dnl USB Support -dnl *********** - -dnl Enable libusb-1.0, if available -AC_ARG_ENABLE(libusb_1_0, - AC_HELP_STRING([--enable-libusb_1_0], [enable libusb-1.0 support if available]), - [enable_libusb_1_0=$enableval], [enable_libusb_1_0=no]) - -dnl USB support enabled by default (if found). Note: Overloading libusb -dnl option right now to disable USB support on any platform; even -dnl if they use a different library name. -AC_ARG_ENABLE(libusb, - AC_HELP_STRING([--disable-libusb], [disable support for USB in SANE]),, - enable_libusb=auto) -HAVE_USB=no -if test "$enable_libusb" != "no"; then - case ${host_os} in - beos*) - AC_CHECK_HEADERS(be/drivers/USB_scanner.h, HAVE_USB=yes, AC_MSG_ERROR([USB_scanner.h is required on BeOS])) - ;; - os2*) - AC_CHECK_HEADER(usbcalls.h, - AC_CHECK_LIB(usbcall, UsbQueryNumberDevices, - [USB_LIBS="$USB_LIBS -lusbcall" - HAVE_USB=yes]),,[#include -#include -]) - ;; - *) - dnl If libusb-1.0 is enabled and available, prefer that to the old libusb - have_libusb_1_0=no - if test "$enable_libusb_1_0" = "yes"; then - PKG_CHECK_MODULES(LIBUSB_1_0, [ libusb-1.0 >= 1.0.0 ], have_libusb_1_0=yes, have_libusb_1_0=no) - if test "$have_libusb_1_0" = "yes"; then - CFLAGS="$CFLAGS $LIBUSB_1_0_CFLAGS" - USB_LIBS="$USB_LIBS $LIBUSB_1_0_LIBS" - HAVE_USB=yes - fi - fi - - if test "$have_libusb_1_0" = "no"; then - dnl Fallback to the old libusb - dnl libusb >= 0.1.8 is required, as we need usb_interrupt_read() - AC_CHECK_HEADER(usb.h, - AC_CHECK_LIB(usb, usb_interrupt_read, - [USB_LIBS="$USB_LIBS -lusb" - HAVE_USB=yes])) - fi - ;; - esac -fi -dnl The following logic is useful for distributions. If they force -dnl USB support with --enable-libusb=yes then configure will fail -dnl when its detected that it can not be supported. Default is -dnl "auto" which means only enable if libraries are found and do -dnl not error out. -if test "$enable_libusb" = "yes" && test "$HAVE_USB" = "no"; then - AC_MSG_ERROR([USB support requested but required libraries not found.]) -fi -if test "$HAVE_USB" = "yes"; then - case ${host_os} in - os2*) - AC_DEFINE(HAVE_USBCALL, 1, [Define to 1 if you have usbcall.dll.]) - ;; - *) - if test "$have_libusb_1_0" = "yes"; then - AC_DEFINE(HAVE_LIBUSB_1_0, 1, [Define to 1 if you have libusb-1.0.]) - else - AC_DEFINE(HAVE_LIBUSB, 1, [Define to 1 if you have libusb.]) - fi - ;; - esac -fi -AC_SUBST(USB_LIBS) - -dnl ************ -dnl SCSI Support -dnl ************ - -dnl FIXME: These are a lot of header files to scan. We should -dnl scan for just one that is unique per platform and then do -dnl conditional scans for more specific only as needed. -AC_CHECK_HEADERS(IOKit/scsi/SCSITaskLib.h IOKit/cdb/IOSCSILib.h \ - IOKit/scsi/SCSICommandOperationCodes.h \ - IOKit/scsi-commands/SCSICommandOperationCodes.h scsi.h sys/scsi.h \ - sys/scsicmd.h sys/scsiio.h bsd/dev/scsireg.h scsi/sg.h \ - camlib.h scdds.h sys/scsi/scsi.h sys/scsi/sgdefs.h \ - sys/scsi/targets/scgio.h apollo/scsi.h sys/sdi_comm.h \ - sys/passthrudef.h) -AC_CHECK_HEADERS([io/cam/cam.h],,,[#include ]) - -dnl FreeBSD < 3 -if test "$ac_cv_header_sys_scsiio_h" = "yes" \ - -a "$ac_cv_header_scsi_h" = "yes"; then - AC_MSG_CHECKING([if 'scsireq_t' needs to be defined as 'struct scsireq']) - AC_TRY_COMPILE([ -#include -#include -],[scsireq_t req],, - [AC_MSG_RESULT(yes); - AC_DEFINE(scsireq_t, struct scsireq_t, - [Define scsireq_t as \'struct scsireq\' if necessary.])], - AC_MSG_RESULT(no)) -fi -AC_CHECK_LIB(scsi, scsireq_enter, SCSI_LIBS="-lscsi") # FreeBSD needs this - -dnl FreeBSD >= 3 -AC_CHECK_LIB(cam, cam_open_device, SCSI_LIBS="-lcam") # FreeBSD 3+ needs this - -AC_CHECK_FUNCS(scsireq_enter) - -if test "$ac_cv_header_scsi_sg_h" = "yes"; then - AC_MSG_CHECKING([for sg_header.target_status in ]) - AC_TRY_COMPILE([ -#include -#include -],[ -struct sg_header hdr; -hdr.target_status = 1; -return 0; -],[AC_MSG_RESULT(yes); - AC_DEFINE(HAVE_SG_TARGET_STATUS,1, - [Define if sg_header.target_status is available.])], - AC_MSG_RESULT(no)) -fi - -if test "$ac_cv_header_IOKit_scsi_SCSITaskLib_h" = "yes"; then - AC_MSG_CHECKING([for SCSITaskSGElement in IOKit/scsi/SCSITaskLib.h]) - AC_TRY_COMPILE([ -#undef VERSION -#include -],[ -SCSITaskSGElement range; -return 0; -],[AC_MSG_RESULT(yes); - AC_DEFINE(HAVE_SCSITASKSGELEMENT, 1, - [Define if SCSITaskSGElement is available.])], - AC_MSG_RESULT(no)) -fi - -dnl disable Linux SCSI generic version 3 to avoid 32/64 bit problems -if sparc64 -q > /dev/null 2>&1 ; then - AC_DEFINE(DISABLE_LINUX_SG_IO, 1, [Should we disable SCSI generic v3?]) -fi - -# Multiple platforms can set SCSI_LIBS so do substitution at end. -AC_SUBST(SCSI_LIBS) - -AC_ARG_ENABLE(scsibuffersize, - AC_HELP_STRING([--enable-scsibuffersize=N], - [specify the default size in bytes of the buffer for SCSI - commands [[default=131072]]]), - [set_scsibuffersize="$enableval"], [set_scsibuffersize=131072]) -AC_DEFINE_UNQUOTED(SCSIBUFFERSIZE, $set_scsibuffersize, - [SCSI command buffer size]) -dnl FIXME: Move tihs to configuration printout area but probably -dnl but probably needs to be wrapped by what ever uses it so its -dnl only printed when used. -echo "scsi buffersize: $set_scsibuffersize" - -AC_ARG_ENABLE(scsi-directio, - AC_HELP_STRING([--enable-scsi-directio], - [enable SCSI direct IO (Linux only, dangerous, see - README.linux)]), - [ - if eval "test x$enable_scsi_directio = xyes"; then - CFLAGS="$CFLAGS -DENABLE_SCSI_DIRECTIO" - fi - ]) - -dnl **** -dnl IPv6 -dnl **** - -dnl check for IPv6 (can be overriden by --enable-ipv6) -if test "$ac_cv_func_getnameinfo" = "yes" \ - && test "$ac_cv_func_getaddrinfo" = "yes" ; then - SANE_CHECK_IPV6 -else - ipv6="no" -fi - -dnl *********************************************************************** -dnl initialize libtool -dnl *********************************************************************** -AC_LIBTOOL_WIN32_DLL -AC_DISABLE_STATIC -AC_PROG_LIBTOOL - -dnl Windows (cygwin/mingw), BeOS, and OS/2 need this. -case $host_os in - cygwin* | mingw* | beos* | os2*) - LDFLAGS="$LDFLAGS -no-undefined" -esac - -dnl Check for lock dir - -AC_ARG_WITH(lockdir, AC_HELP_STRING([--with-lockdir=DIR], - [set SANE lockdir @<:@localstatedir/lock/sane@:>@]), - [locksanedir=$withval],[locksanedir=${localstatedir}/lock/sane]) -AC_SUBST(locksanedir) - -configdir="${sysconfdir}/sane.d" -AC_SUBST(configdir) - -dnl *********************************************************************** -dnl enable/disable backends and features based on previous tests and user's -dnl choice -dnl *********************************************************************** - -CPPFLAGS="${CPPFLAGS} -DPATH_SANE_CONFIG_DIR=\$(configdir) \ - -DPATH_SANE_DATA_DIR=\$(datadir) \ - -DPATH_SANE_LOCK_DIR=\$(locksanedir) \ - -DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR}" - -if test "${ac_cv_header_sys_socket_h}" = "no"; then - echo "*** disabling saned (sys/socket.h not found)" - SANED= -else - SANED=saned -fi -AM_CONDITIONAL(COMPILE_SANED, test x$SANED = xsaned) - -dnl These are the backends that are build in any case: - -AC_ARG_ENABLE(local-backends, - AC_HELP_STRING([--disable-local-backends], - [turn off compilation of all backends but net])) - -ALL_BACKENDS="geniusvp2 ls5000" - -# If user specifies backends manually then cause configure -# to fail if its detected it can't be compiled. If we -# are in automatic mode then remove backend from list instead. -user_selected_backends="yes" - -if eval "test x$enable_local_backends = xno"; then - BACKENDS="net" -else - if test "${BACKENDS}" != "" ; then - AC_MSG_NOTICE([Manually selected backends: ${BACKENDS}]) - else - BACKENDS="$ALL_BACKENDS" - user_selected_backends="no" - fi -fi - -SANE_CHECK_BACKENDS - -if test "${sane_cv_use_libjpeg}" = "yes"; then - SANEI_SANEI_JPEG_LO="../sanei/sanei_jpeg.lo" -fi -AM_CONDITIONAL(HAVE_JPEG, test x$sane_cv_use_libjpeg = xyes) -AC_SUBST(SANEI_SANEI_JPEG_LO) - -BACKENDS="$FILTERED_BACKENDS" -BACKEND_LIBS_ENABLED="" -BACKEND_CONFS_ENABLED="" -BACKEND_MANS_ENABLED="" -for backend in ${BACKENDS} ; do - BACKEND_LIBS_ENABLED="${BACKEND_LIBS_ENABLED} libsane-${backend}.la" - BACKEND_CONFS_ENABLED="${BACKEND_CONFS_ENABLED} ${backend}.conf" - BACKEND_MANS_ENABLED="${BACKEND_MANS_ENABLED} sane-${backend}.5" -done -AC_SUBST(BACKEND_LIBS_ENABLED) - -if test "${enable_shared}" = "no"; then - enable_preload=yes -fi -if test "${enable_dynamic}" != yes || test "${enable_preload}" = "yes"; then - echo "preloading backends into DLL" - - # If user specifies backends manually then cause configure - # to fail if its detected it can't be compiled. If we - # are in automatic mode then remove backend from list instead. - user_selected_backends="yes" - - if eval "test x$enable_local_backends = xno"; then - PRELOADABLE_BACKENDS="net" - else - if test "${PRELOADABLE_BACKENDS}" != "" ; then - AC_MSG_NOTICE([Manually selected preloadable backends: ${PRELOADABLE_BACKENDS}]) - else - PRELOADABLE_BACKENDS="$ALL_BACKENDS" - user_selected_backends="no" - fi - fi - - saved_BACKENDS="$BACKENDS" - BACKENDS="${PRELOADABLE_BACKENDS}" - - SANE_CHECK_BACKENDS - - PRELOADABLE_BACKENDS="$FILTERED_BACKENDS" - BACKENDS="$saved_BACKENDS" -else - PRELOADABLE_BACKENDS="" -fi -PRELOADABLE_BACKENDS_ENABLED="" -# Do not initialize BACKEND_CONFS_ENABLED so that its a combination -# of all backends. -for backend in ${PRELOADABLE_BACKENDS} ; do - BACKEND_CONFS_ENABLED="${BACKEND_CONFS_ENABLED} ${backend}.conf" - BACKEND_MANS_ENABLED="${BACKEND_MANS_ENABLED} sane-${backend}.5" - # Special hacks. Normally, we create a convenience library that - # matches the backend's name but in some cases that will conflict - # with an external library name that also matches backend name. - # Work around that here by renaming internal library. - if test "${backend}" = "gphoto2"; then - backend=gphoto2_i - fi - PRELOADABLE_BACKENDS_ENABLED="${PRELOADABLE_BACKENDS_ENABLED} lib${backend}.la" -done - -AC_SUBST(PRELOADABLE_BACKENDS) -AC_SUBST(PRELOADABLE_BACKENDS_ENABLED) -AC_SUBST(BACKEND_CONFS_ENABLED) -AC_SUBST(BACKEND_MANS_ENABLED) - -dnl in BeOS, backends are not installed in lib/sane, but add-ons/sane/ -dnl we account for both installing in /boot/beos and ~/config -case $host_os in - beos*) - libdir='${exec_prefix}/add-ons' - ;; -esac - -AC_ARG_ENABLE(parport-directio, - AC_HELP_STRING([--enable-parport-directio], - [enable direct hardware access to the parallel port, so - frontends will require special permission level]), - [ - if eval "test x$enable_parport_directio = xyes"; then - CFLAGS="$CFLAGS -DENABLE_PARPORT_DIRECTIO" - fi - ]) - -AC_ARG_ENABLE(translations, - AC_HELP_STRING([--disable-translations], - [don't install translations of backend options]),, - enable_translations=yes) -if eval "test x$enable_translations = xyes" ; then - if test x$MSGFMT = xno || test x$XGETTEXT = xno || test $MSGMERGE = no ; then - enable_translations=no - echo "disabling translations (missing msgfmt, xgettext or msgmerge)" - else - echo "enabling translations" - fi -else - echo "disabling translations" -fi -AM_CONDITIONAL(ENABLE_TRANSLATIONS, test x$enable_translations = xyes) - -AC_ARG_ENABLE(latex, - AC_HELP_STRING([--disable-latex], - [disable use of latex, et.al., to generate documentation]),, - enable_latex=yes) -if test "x$enable_latex" = "xyes" ; then - if test "x$LATEX" = "xno" || test "x$DVIPS" = "xno" || test "x$MAKEINDEX" = "xno" ; then - enable_latex=no - echo "disabling latex (missing latex, dvips or makeindex)" - else - echo "enabling latex" - fi -else - echo "disabling latex" -fi -AM_CONDITIONAL(USE_LATEX, test x$enable_latex = xyes) - -dnl *********************************************************************** -dnl Write output files -dnl *********************************************************************** - -DISTCLEAN_FILES="*~ .*~ *.log *.bak *.old *.orig *.out *.rej \"\#\"* \".\\#\"*" -AC_SUBST(DISTCLEAN_FILES) - -AC_CONFIG_FILES([Makefile lib/Makefile sanei/Makefile \ - backend/Makefile include/Makefile doc/Makefile]) -AC_OUTPUT - -dnl *********************************************************************** -dnl print configuration information -dnl *********************************************************************** - -echo "-> Variables used for compilation/linking:" -echo CPPFLAGS=\"${CPPFLAGS}\" -echo CFLAGS=\"${CFLAGS}\" -echo LDFLAGS=\"${LDFLAGS}\" -echo LIBS=\"${LIBS}\" -echo "-> Installation directories:" -echo "Configuration: `eval eval echo ${sysconfdir}`" -echo "Libraries: `eval eval echo ${libdir}`" -echo "Binaries: `eval eval echo ${bindir}` and `eval eval echo ${sbindir}`" -echo "Manpages: `eval eval echo ${mandir}`" -echo "Documentation: `eval eval echo ${docdir}`" -if eval "test x$INSTALL_LOCKPATH = xinstall-lockpath" ; then - echo "Lockfiles: `eval eval echo ${locksanedir}`" -else - echo "Lockfiles: Feature is disabled!" -fi -echo "-> Network parameters:" -if test "${SANED}" = "saned" ; then - echo "Build saned: yes" -else - echo "Build saned: no" -fi -echo "IPv6 support: `eval eval echo ${ipv6}`" -echo "Avahi support: `eval eval echo ${enable_avahi}`" -echo "SNMP support: `eval eval echo ${with_snmp}`" -echo "-> The following backends will be built:" -for backend in ${BACKENDS} ; do - echo $ECHO_N "${backend} " -done -echo -echo -echo "-> The following preload backends will be built:" -for backend in ${PRELOADABLE_BACKENDS} ; do - echo $ECHO_N "${backend} " -done -echo - -if test "$SANE_CONFIG_PATH" != "no" ; then - SANE_INSTALLED_VERSION=`$SANE_CONFIG_PATH --version` - SANE_INSTALLED_PREFIX=`$SANE_CONFIG_PATH --prefix` - if test "$SANE_INSTALLED_PREFIX" != "$prefix" ; then - echo "*** WARNING: SANE is already installed (version $SANE_INSTALLED_VERSION). The old" - echo "*** installation is at $SANE_INSTALLED_PREFIX while SANE will now be installed" - echo "*** at $prefix. It is recommended to uninstall the old SANE version" - echo "*** before installing the new one to avoid problems." - fi -else - if test "$LIBSANE_EXISTS" = "yes" ; then - echo "*** Warning: An old version of SANE was detected but the sane-config program" - echo "*** couldn't be found. If you encounter any problems with SANE remove the old" - echo "*** SANE files and reinstall this version." - fi -fi -if eval "test x${sysconfdir} = x/usr/etc" ; then - echo "*** WARNING: Configuration files are stored in /usr/etc. If this is not" - echo "*** intended, use --sysconfdir to set another path (e.g. "/etc")." -fi -if test "$SELECTED_BACKENDS" != "" ; then - echo "*** Warning: Local backends have been disabled. This means that scanners" - echo "*** connected to your local computer won't be supported. Only a network" - echo "*** connection to a remote host is possible." -fi -if test "$enable_libusb" != "no" && test "$HAVE_USB" != "yes" ; then - echo "*** Warning: sane-backends will be built without libusb support. There may" - echo "*** be valid reasons to do so, e.g. if you don't use USB scanners or on" - echo "*** platforms without libusb support but generally this means that you" - echo "*** can't use USB devices with SANE. The most probable cause is that" - if test "${ac_cv_header_usb_h}" != "yes"; then - echo "*** the libusb header file usb.h is not installed. If you use Linux" - echo "*** you may need a package called 'libusb-dev', 'libusb-devel' or similar." - else - echo "*** libusb is not installed at all or is too old. See README." - fi -fi - -echo "****************************************************************" -echo "* Please be sure to read file PROBLEMS in this directory *" -echo "* BEFORE running any of the SANE applications. Some devices *" -echo "* may be damaged by improper operation, so please do heed this *" -echo "* advice. *" -echo "****************************************************************" diff -Nru sane-backends-extras-1.0.22.4build1/debian/autoreconf.after sane-backends-extras-1.0.22.5/debian/autoreconf.after --- sane-backends-extras-1.0.22.4build1/debian/autoreconf.after 2017-01-06 11:53:21.000000000 +0000 +++ sane-backends-extras-1.0.22.5/debian/autoreconf.after 1970-01-01 00:00:00.000000000 +0000 @@ -1,117 +0,0 @@ -53103fbe1390f4b7fbea3142d1dcb540 ./include/md5.h -d7158fd1380e765ead7da0753ae8f5b8 ./include/Makefile.am -b0939e676c216ff1327644660fe5bede ./include/lalloca.h -042131e8b0369ee43d2a4abd11b8f8f7 ./include/sane/sanei_access.h -5c01770ba4068138d9d75ee6f41d9781 ./include/sane/sanei_jpeg.h -46d3d9b4b2af997b462be38382c2917d ./include/sane/sanei_scsi.h -c14f73815e1cc4b2d8e87c4a62655db6 ./include/sane/sanei_pp.h -9fe7c2d18790e2e115501e1222cd3b38 ./include/sane/sanei_codec_ascii.h -932bf49179e75a6dca94e33dca355a0f ./include/sane/sanei_tcp.h -6b78a2752b577a82f7c9e561357a243c ./include/sane/sanei_usb.h -cf979acb1a9ce28b035cd46e58430fb6 ./include/sane/sane.h -c43c7593a75b5cee114456495a638ded ./include/sane/sanei_debug.h -b5c5a57844cbfab85784f6d34ac97201 ./include/sane/sanei_udp.h -e6e04d574a9753d612f7cdac8739678a ./include/sane/sanei_codec_bin.h -89c5b02cc7ef9bb79dbe1dd9261ad2f9 ./include/sane/sanei_magic.h -fa221f35227e752dd9403e8fe1422bfb ./include/sane/sanei.h -3c283a96401291e4b3bcb69c5802fdf6 ./include/sane/sanei_net.h -eb959d1c223c83c7c12501fa0a1af8e7 ./include/sane/sanei_lm983x.h -dbde79bc104a2caa9316cc2a9df7fd25 ./include/sane/sanei_jinclude.h -6a727bccd878cff3523482813c6b7cfb ./include/sane/sanei_config.h -20391624bf4768eb4025551d1f030811 ./include/sane/sanei_auth.h -46f080fec20d9693dbffeefbb47b99f5 ./include/sane/sanei_ab306.h -db07d7163387491cadcb979b2a2949a1 ./include/sane/sanei_pio.h -8cdb7757b42fd9b116e8d5acc206ff29 ./include/sane/sanei_wire.h -6da0444d743248effa7a91eca3367ea9 ./include/sane/sanei_thread.h -0b0ae5bff974d701927093da1e0819e9 ./include/sane/saneopts.h -c95f9177f646e6b7a4a722e84db22abd ./include/sane/sanei_pv8630.h -38913bafd1ff78e24c0ec1dc806dc0cb ./include/sane/sanei_pa4s2.h -767dd2e0f3a66872ea9ca7328f71df0a ./include/sane/sanei_backend.h -023c024f882773b78143e7b16d959dcc ./include/sane/sanei_cderror.h -9168ca027ba34557b1aac3e60dc6700a ./include/font_6x11.h -d482ea2544799ad75c8ae7ebe0e7eb2c ./include/lassert.h -59f332e50cae61a773c90be98b9d9b7f ./include/lgetopt.h -a7e7d7790844f3b32d105945e0352274 ./configure.in -1bb8c2b86e952aa6c96333a89b316951 ./backend/geniusvp2-misc.c -5c3ab3ff149b4d770b067717ebcfeeb7 ./backend/geniusvp2-adc.c -292bd613fd692219298e222d6f99cd91 ./backend/geniusvp2-adc.h -f12a860a6d601804e3baf9d98dead07e ./backend/geniusvp2-misc.h -a9af39240207e79341cfbb1e0a4cc430 ./backend/geniusvp2-parport.h -fc41caa1975728ef6487f35124e9a386 ./backend/geniusvp2-image.h -9c1af33c9b4fc2c86d427d6595e71992 ./backend/geniusvp2-registers.h -815f8e3f6a2c42a0a878206a42061ae2 ./backend/geniusvp2-parport.c -b7d73901eb2457d8dd57141618caa1e7 ./backend/geniusvp2.c -27105dad17d2bfbcdb94a08bf0ad92a9 ./backend/geniusvp2-switcher.h -3e261231a22791ad0a9ac62d48833edc ./backend/Makefile.am -e0797ac103be1544c8e901902f33305c ./backend/stubs.c -c3ea7268a812a647b0422170e4ddbf8c ./backend/geniusvp2.h -57a8d4658fab75802a0ad8e11e7262ca ./backend/geniusvp2.conf.in -14bbc2a0b120bb76ed253461e704a825 ./backend/geniusvp2-asic.h -333ce6b8b7da415918aef0bb023c3c87 ./backend/geniusvp2-image.c -c236b65805317435c127a67e20ee1998 ./backend/geniusvp2-switcher.c -94f190b5ef5d5753ec100aa8085540e7 ./backend/ls5000.c -6779564578489961e558a5fa4caf73dd ./backend/sane_strstatus.c -e2a0479e528131c0def076b37d428a87 ./backend/geniusvp2-asic.c -2a42857adc24f1462e80a4778b6603da ./lib/strdup.c -92f0f991fd14ce07d9dee5b98d095c83 ./lib/vsyslog.c -51421cb19f53f6cc7acaccbcd0ad0dce ./lib/getopt.c -7dea5ac7f2a09260b4f35d007402402b ./lib/md5.c -cefd6e7123bbde4955bb5f738549e11b ./lib/sigprocmask.c -0741495536dc50b35c99ff43ff15cef4 ./lib/alloca.c -865c15924241f5e9ee4603a8c78c72fe ./lib/isfdtype.c -6bc613b64c859940f8e2ba1e2519c3f9 ./lib/getopt1.c -e9841888f7adb67c9be2a1fa71c1edd6 ./lib/Makefile.am -1f3c98161ea67e1897be4c206a1d74a4 ./lib/snprintf.c -ecdf14f679949b478131ded25f8b9ea3 ./lib/usleep.c -b348ae879526556008e2eef780d7002d ./lib/inet_ntop.c -564567dd9921fa47a4846af08e8ebc86 ./lib/strndup.c -2ea1871837d6c8e901b12aabafc892ab ./lib/inet_pton.c -7e45116d49b79a59fb777a4e795809d0 ./lib/getenv.c -29d3e366c44aa33b2e2fb29af0219d24 ./lib/strcasestr.c -8c0ec60a4fa7e2c0a1a814f06667920c ./lib/strsep.c -d57dd44dba77c591a4b15c15fea6ced7 ./README.linux -89eaf580b15e659e3c59d94b3ced61c3 ./m4/byteorder.m4 -ca2a441b6dc6af8dc942f879d33b7a17 ./m4/stdint.m4 -cb36e98218b07025c707bc79c12a461c ./Makefile.am -e6658e52c79b2c368296c883d90979b9 ./config.guess -963d5a6ef0414002377fefbea01368d0 ./doc/Makefile.am -d1e1dd4c389fef1be039bf232b6abc23 ./doc/sane-geniusvp2.man -e382207f1556d8cce2257b3fd496ad74 ./LICENSE -8e34da5490e15e687147ecc203c3f3d9 ./ChangeLog -75d347689542d4ca2b8a1eef7ee33f8e ./acinclude.m4 -fb0c2e9aee5f39ff3eae3e22d88041f7 ./PROJECTS -5f1d90918eb0a386a4734fed603837c7 ./AUTHORS -0636e73ff0215e8d672dc4c32c317bb3 ./COPYING -e58e60b0393ad7c80198d0613504f593 ./README -c04758aa3c9293433354ac77dbae989a ./sanei/sanei_wire.c -decda928023e24e9e3873da1282405fd ./sanei/sanei_constrain_value.c -0f257c128aa73ece59cadc727c4ac0e8 ./sanei/sanei_DomainOS.c -616090fde45c836370f47f92a354d0ee ./sanei/test_wire.c -4203361d6edf3579b235477670e92fbf ./sanei/sanei_ab306.c -76f819be6478cf502401a6f558409be2 ./sanei/linux_sg3_err.h -4dfc7ed16606d0901013d82c377e57a5 ./sanei/sanei_DomainOS.h -53957a31e023da4509050eeb9e0822ee ./sanei/sanei_pio.c -579c47274afa6351e90f2e0c6569dff0 ./sanei/sanei_config2.c -15fcfeec32c89c166cfc5228424ad703 ./sanei/sanei_config.c -7633ba7204719fd43f19e82b1847b2ec ./sanei/sanei_scsi.c -2f767717164369a1940149e03d16c45d ./sanei/Makefile.am -d648cd4ba3ec0e4d8dbacc2c3be2f353 ./sanei/os2_srb.h -91126989260f077d11dcc918fb16062f ./sanei/sanei_udp.c -258e704e1f7646091abda591d66d4859 ./sanei/sanei_usb.c -6fcf0f373cec7f1205736a3a89c30425 ./sanei/sanei_init_debug.c -54dfb95891ee33b70d7e6c26034b2ee3 ./sanei/sanei_auth.c -22c5bef92254e9dd3f50ca92fb76c596 ./sanei/sanei_pv8630.c -eaf4d70ce3fc816c7f327923f93c4b6a ./sanei/sanei_thread.c -6a0c6b9b293d99a73abeae6c19aeb7b8 ./sanei/sanei_access.c -8000f5f32d928fea076b7ad5e0c00a5c ./sanei/sanei_pa4s2.c -99d6ebb9aae50092d9c2a490a0424ae0 ./sanei/sanei_codec_bin.c -42f7cb5e6b63928b82b8190eb32556d1 ./sanei/sanei_lm983x.c -78930a3541155b758ba9d61932bac331 ./sanei/sanei_magic.c -41cdfdaf272f44f44acdd2eb927cea17 ./sanei/sanei_jpeg.c -c8a92b1cd5932896a1b4547127712e0b ./sanei/sanei_pp.c -fd6ff9ac4aabeea99ba1a29dd8b221bc ./sanei/sanei_codec_ascii.c -6fb16c650eec7c7067780635f537bfcb ./sanei/sanei_tcp.c -422bf00d60162d3a8617989e6af75474 ./sanei/sanei_net.c -f32edfea91a86edcbb7da9fb63e9149b ./config.sub -cc5d3c4c89de3162b89aa1c18392cccc ./PROBLEMS -81b14aa661aed693fcdbbf2d261e38d6 ./NEWS diff -Nru sane-backends-extras-1.0.22.4build1/debian/autoreconf.before sane-backends-extras-1.0.22.5/debian/autoreconf.before --- sane-backends-extras-1.0.22.4build1/debian/autoreconf.before 2017-01-06 11:53:21.000000000 +0000 +++ sane-backends-extras-1.0.22.5/debian/autoreconf.before 1970-01-01 00:00:00.000000000 +0000 @@ -1,117 +0,0 @@ -53103fbe1390f4b7fbea3142d1dcb540 ./include/md5.h -d7158fd1380e765ead7da0753ae8f5b8 ./include/Makefile.am -b0939e676c216ff1327644660fe5bede ./include/lalloca.h -042131e8b0369ee43d2a4abd11b8f8f7 ./include/sane/sanei_access.h -5c01770ba4068138d9d75ee6f41d9781 ./include/sane/sanei_jpeg.h -46d3d9b4b2af997b462be38382c2917d ./include/sane/sanei_scsi.h -c14f73815e1cc4b2d8e87c4a62655db6 ./include/sane/sanei_pp.h -9fe7c2d18790e2e115501e1222cd3b38 ./include/sane/sanei_codec_ascii.h -932bf49179e75a6dca94e33dca355a0f ./include/sane/sanei_tcp.h -6b78a2752b577a82f7c9e561357a243c ./include/sane/sanei_usb.h -cf979acb1a9ce28b035cd46e58430fb6 ./include/sane/sane.h -c43c7593a75b5cee114456495a638ded ./include/sane/sanei_debug.h -b5c5a57844cbfab85784f6d34ac97201 ./include/sane/sanei_udp.h -e6e04d574a9753d612f7cdac8739678a ./include/sane/sanei_codec_bin.h -89c5b02cc7ef9bb79dbe1dd9261ad2f9 ./include/sane/sanei_magic.h -fa221f35227e752dd9403e8fe1422bfb ./include/sane/sanei.h -3c283a96401291e4b3bcb69c5802fdf6 ./include/sane/sanei_net.h -eb959d1c223c83c7c12501fa0a1af8e7 ./include/sane/sanei_lm983x.h -dbde79bc104a2caa9316cc2a9df7fd25 ./include/sane/sanei_jinclude.h -6a727bccd878cff3523482813c6b7cfb ./include/sane/sanei_config.h -20391624bf4768eb4025551d1f030811 ./include/sane/sanei_auth.h -46f080fec20d9693dbffeefbb47b99f5 ./include/sane/sanei_ab306.h -db07d7163387491cadcb979b2a2949a1 ./include/sane/sanei_pio.h -8cdb7757b42fd9b116e8d5acc206ff29 ./include/sane/sanei_wire.h -6da0444d743248effa7a91eca3367ea9 ./include/sane/sanei_thread.h -0b0ae5bff974d701927093da1e0819e9 ./include/sane/saneopts.h -c95f9177f646e6b7a4a722e84db22abd ./include/sane/sanei_pv8630.h -38913bafd1ff78e24c0ec1dc806dc0cb ./include/sane/sanei_pa4s2.h -767dd2e0f3a66872ea9ca7328f71df0a ./include/sane/sanei_backend.h -023c024f882773b78143e7b16d959dcc ./include/sane/sanei_cderror.h -9168ca027ba34557b1aac3e60dc6700a ./include/font_6x11.h -d482ea2544799ad75c8ae7ebe0e7eb2c ./include/lassert.h -59f332e50cae61a773c90be98b9d9b7f ./include/lgetopt.h -a7e7d7790844f3b32d105945e0352274 ./configure.in -1bb8c2b86e952aa6c96333a89b316951 ./backend/geniusvp2-misc.c -5c3ab3ff149b4d770b067717ebcfeeb7 ./backend/geniusvp2-adc.c -292bd613fd692219298e222d6f99cd91 ./backend/geniusvp2-adc.h -f12a860a6d601804e3baf9d98dead07e ./backend/geniusvp2-misc.h -a9af39240207e79341cfbb1e0a4cc430 ./backend/geniusvp2-parport.h -fc41caa1975728ef6487f35124e9a386 ./backend/geniusvp2-image.h -9c1af33c9b4fc2c86d427d6595e71992 ./backend/geniusvp2-registers.h -815f8e3f6a2c42a0a878206a42061ae2 ./backend/geniusvp2-parport.c -b7d73901eb2457d8dd57141618caa1e7 ./backend/geniusvp2.c -27105dad17d2bfbcdb94a08bf0ad92a9 ./backend/geniusvp2-switcher.h -3e261231a22791ad0a9ac62d48833edc ./backend/Makefile.am -e0797ac103be1544c8e901902f33305c ./backend/stubs.c -c3ea7268a812a647b0422170e4ddbf8c ./backend/geniusvp2.h -57a8d4658fab75802a0ad8e11e7262ca ./backend/geniusvp2.conf.in -14bbc2a0b120bb76ed253461e704a825 ./backend/geniusvp2-asic.h -333ce6b8b7da415918aef0bb023c3c87 ./backend/geniusvp2-image.c -c236b65805317435c127a67e20ee1998 ./backend/geniusvp2-switcher.c -94f190b5ef5d5753ec100aa8085540e7 ./backend/ls5000.c -6779564578489961e558a5fa4caf73dd ./backend/sane_strstatus.c -e2a0479e528131c0def076b37d428a87 ./backend/geniusvp2-asic.c -2a42857adc24f1462e80a4778b6603da ./lib/strdup.c -92f0f991fd14ce07d9dee5b98d095c83 ./lib/vsyslog.c -51421cb19f53f6cc7acaccbcd0ad0dce ./lib/getopt.c -7dea5ac7f2a09260b4f35d007402402b ./lib/md5.c -cefd6e7123bbde4955bb5f738549e11b ./lib/sigprocmask.c -0741495536dc50b35c99ff43ff15cef4 ./lib/alloca.c -865c15924241f5e9ee4603a8c78c72fe ./lib/isfdtype.c -6bc613b64c859940f8e2ba1e2519c3f9 ./lib/getopt1.c -e9841888f7adb67c9be2a1fa71c1edd6 ./lib/Makefile.am -1f3c98161ea67e1897be4c206a1d74a4 ./lib/snprintf.c -ecdf14f679949b478131ded25f8b9ea3 ./lib/usleep.c -b348ae879526556008e2eef780d7002d ./lib/inet_ntop.c -564567dd9921fa47a4846af08e8ebc86 ./lib/strndup.c -2ea1871837d6c8e901b12aabafc892ab ./lib/inet_pton.c -7e45116d49b79a59fb777a4e795809d0 ./lib/getenv.c -29d3e366c44aa33b2e2fb29af0219d24 ./lib/strcasestr.c -8c0ec60a4fa7e2c0a1a814f06667920c ./lib/strsep.c -d57dd44dba77c591a4b15c15fea6ced7 ./README.linux -89eaf580b15e659e3c59d94b3ced61c3 ./m4/byteorder.m4 -ca2a441b6dc6af8dc942f879d33b7a17 ./m4/stdint.m4 -cb36e98218b07025c707bc79c12a461c ./Makefile.am -e6658e52c79b2c368296c883d90979b9 ./config.guess -963d5a6ef0414002377fefbea01368d0 ./doc/Makefile.am -d1e1dd4c389fef1be039bf232b6abc23 ./doc/sane-geniusvp2.man -e382207f1556d8cce2257b3fd496ad74 ./LICENSE -8e34da5490e15e687147ecc203c3f3d9 ./ChangeLog -75d347689542d4ca2b8a1eef7ee33f8e ./acinclude.m4 -fb0c2e9aee5f39ff3eae3e22d88041f7 ./PROJECTS -5f1d90918eb0a386a4734fed603837c7 ./AUTHORS -0636e73ff0215e8d672dc4c32c317bb3 ./COPYING -e58e60b0393ad7c80198d0613504f593 ./README -c04758aa3c9293433354ac77dbae989a ./sanei/sanei_wire.c -decda928023e24e9e3873da1282405fd ./sanei/sanei_constrain_value.c -0f257c128aa73ece59cadc727c4ac0e8 ./sanei/sanei_DomainOS.c -616090fde45c836370f47f92a354d0ee ./sanei/test_wire.c -4203361d6edf3579b235477670e92fbf ./sanei/sanei_ab306.c -76f819be6478cf502401a6f558409be2 ./sanei/linux_sg3_err.h -4dfc7ed16606d0901013d82c377e57a5 ./sanei/sanei_DomainOS.h -53957a31e023da4509050eeb9e0822ee ./sanei/sanei_pio.c -579c47274afa6351e90f2e0c6569dff0 ./sanei/sanei_config2.c -15fcfeec32c89c166cfc5228424ad703 ./sanei/sanei_config.c -7633ba7204719fd43f19e82b1847b2ec ./sanei/sanei_scsi.c -2f767717164369a1940149e03d16c45d ./sanei/Makefile.am -d648cd4ba3ec0e4d8dbacc2c3be2f353 ./sanei/os2_srb.h -91126989260f077d11dcc918fb16062f ./sanei/sanei_udp.c -258e704e1f7646091abda591d66d4859 ./sanei/sanei_usb.c -6fcf0f373cec7f1205736a3a89c30425 ./sanei/sanei_init_debug.c -54dfb95891ee33b70d7e6c26034b2ee3 ./sanei/sanei_auth.c -22c5bef92254e9dd3f50ca92fb76c596 ./sanei/sanei_pv8630.c -eaf4d70ce3fc816c7f327923f93c4b6a ./sanei/sanei_thread.c -6a0c6b9b293d99a73abeae6c19aeb7b8 ./sanei/sanei_access.c -8000f5f32d928fea076b7ad5e0c00a5c ./sanei/sanei_pa4s2.c -99d6ebb9aae50092d9c2a490a0424ae0 ./sanei/sanei_codec_bin.c -42f7cb5e6b63928b82b8190eb32556d1 ./sanei/sanei_lm983x.c -78930a3541155b758ba9d61932bac331 ./sanei/sanei_magic.c -41cdfdaf272f44f44acdd2eb927cea17 ./sanei/sanei_jpeg.c -c8a92b1cd5932896a1b4547127712e0b ./sanei/sanei_pp.c -fd6ff9ac4aabeea99ba1a29dd8b221bc ./sanei/sanei_codec_ascii.c -6fb16c650eec7c7067780635f537bfcb ./sanei/sanei_tcp.c -422bf00d60162d3a8617989e6af75474 ./sanei/sanei_net.c -f32edfea91a86edcbb7da9fb63e9149b ./config.sub -cc5d3c4c89de3162b89aa1c18392cccc ./PROBLEMS -81b14aa661aed693fcdbbf2d261e38d6 ./NEWS diff -Nru sane-backends-extras-1.0.22.4build1/debian/changelog sane-backends-extras-1.0.22.5/debian/changelog --- sane-backends-extras-1.0.22.4build1/debian/changelog 2017-07-23 07:12:03.000000000 +0000 +++ sane-backends-extras-1.0.22.5/debian/changelog 2017-09-27 10:10:26.000000000 +0000 @@ -1,8 +1,24 @@ -sane-backends-extras (1.0.22.4build1) artful; urgency=medium +sane-backends-extras (1.0.22.5) unstable; urgency=medium - * Rebuild against new libsane1. + * QA upload. + * debhelper update: + - Update package compatibility to level 10 + * debian/control: + - Bump debhelper build-dep to >= 10~. + - Remove autotools-dev from the Build-Depends list, as debhelper + enables the 'autoreconf' sequence by default. + - Bump Standards-Version from 3.9.8 to 4.1.0 (no changes needed). + - Convert libsane-extras-common to Architecture: all. + - Mark libsane-extras-dev Multi-Arch: same (Closes: #862263). + * debian/extras-backends/geniusvp2: + - Fix a spelling error in the BUGS file (lintian). + * debian/rules: + - Remove '--with=autotools_dev' (now handled by debhelper level 10). + * doc/sane-geniusvp2.man: + - Fix spelling errors (lintian). + * Rename configure.in to configure.ac (lintian). - -- Gianfranco Costamagna Sun, 23 Jul 2017 09:12:03 +0200 + -- Hugh McMaster Wed, 27 Sep 2017 20:10:26 +1000 sane-backends-extras (1.0.22.4) unstable; urgency=medium diff -Nru sane-backends-extras-1.0.22.4build1/debian/compat sane-backends-extras-1.0.22.5/debian/compat --- sane-backends-extras-1.0.22.4build1/debian/compat 2013-05-13 21:02:16.000000000 +0000 +++ sane-backends-extras-1.0.22.5/debian/compat 2017-09-27 10:00:03.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru sane-backends-extras-1.0.22.4build1/debian/control sane-backends-extras-1.0.22.5/debian/control --- sane-backends-extras-1.0.22.4build1/debian/control 2017-01-06 11:53:21.000000000 +0000 +++ sane-backends-extras-1.0.22.5/debian/control 2017-09-27 10:10:26.000000000 +0000 @@ -2,15 +2,15 @@ Section: graphics Priority: optional Maintainer: Debian QA Group -Standards-Version: 3.9.8 -Build-Depends: debhelper (>= 9~), libusb-1.0-0-dev [!hurd-i386], pkg-config, autotools-dev, xutils-dev, chrpath +Standards-Version: 4.1.0 +Build-Depends: debhelper (>= 10~), libusb-1.0-0-dev [!hurd-i386], pkg-config, xutils-dev, chrpath Package: libsane-extras-common Section: libs -Architecture: any +Architecture: all Multi-Arch: foreign Depends: ${misc:Depends} -Replaces: libsane-extras (<< 1.0.22.2~) +Replaces: libsane-extras (<< 1.0.22.2~), libsane-extras-common (<= 1.0.22.4~) Description: API library for scanners -- documentation and support files SANE stands for "Scanner Access Now Easy" and is an application programming interface (API) that provides standardized access to any @@ -30,7 +30,7 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, ${misc:Depends}, libsane-extras-common (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libsane-extras-common (= ${source:Version}) Description: API library for scanners -- extra backends SANE stands for "Scanner Access Now Easy" and is an application programming interface (API) that provides standardized access to any @@ -50,7 +50,9 @@ Package: libsane-extras-dev Section: libdevel Architecture: any -Depends: libsane-extras (= ${binary:Version}), , ${misc:Depends} +Multi-Arch: same +Depends: libsane-extras (= ${binary:Version}), ${misc:Depends} +Replaces: libsane-extras-dev (<= 1.0.22.4~) Description: API development library for scanners [development files] SANE stands for "Scanner Access Now Easy" and is an application programming interface (API) that provides standardized access to any diff -Nru sane-backends-extras-1.0.22.4build1/debian/extras-backends/geniusvp2/geniusvp2.BUGS sane-backends-extras-1.0.22.5/debian/extras-backends/geniusvp2/geniusvp2.BUGS --- sane-backends-extras-1.0.22.4build1/debian/extras-backends/geniusvp2/geniusvp2.BUGS 2005-09-04 20:18:04.000000000 +0000 +++ sane-backends-extras-1.0.22.5/debian/extras-backends/geniusvp2/geniusvp2.BUGS 2017-09-27 10:10:26.000000000 +0000 @@ -13,6 +13,6 @@ - the lamp carriage may sometimes go out of its maximum distance (297 mm), forcing the motor engine. You can detect this when the scanner produces a "strange" noise and the carriage is at its maximum distance from home. In this -situation, **turn off scanner power imediately**, or you can risk damage your +situation, **turn off scanner power immediately**, or you can risk damage your device. This seems to happen more often when scanning full pages at high resolutions. diff -Nru sane-backends-extras-1.0.22.4build1/debian/rules sane-backends-extras-1.0.22.5/debian/rules --- sane-backends-extras-1.0.22.4build1/debian/rules 2017-01-06 11:53:21.000000000 +0000 +++ sane-backends-extras-1.0.22.5/debian/rules 2017-09-27 10:10:26.000000000 +0000 @@ -13,7 +13,7 @@ endif %: - dh $@ --with=autotools_dev + dh $@ override_dh_auto_configure: dh_auto_configure -- \ diff -Nru sane-backends-extras-1.0.22.4build1/doc/sane-geniusvp2.man sane-backends-extras-1.0.22.5/doc/sane-geniusvp2.man --- sane-backends-extras-1.0.22.4build1/doc/sane-geniusvp2.man 2011-02-16 20:17:37.000000000 +0000 +++ sane-backends-extras-1.0.22.5/doc/sane-geniusvp2.man 2017-09-27 10:10:26.000000000 +0000 @@ -36,7 +36,7 @@ Memory: NEC uPD424210\-60 (256 Kb?) .SH "CONFIGURATION" .PP -This section decribes the backend's configuration file entries. The file is located at: +This section describes the backend's configuration file entries. The file is located at: .IP .I @CONFIGDIR@/geniusvp2.conf .PP @@ -80,7 +80,7 @@ Scans at high resolutions (e.g. 600 dpi.) may also be truncated if the selected scan area is too large. Just scan at lower (<= 300 dpi.) resolutions for now if you want a larger image. .PP The lamp carriage may sometimes go out of its maximum distance (297 mm), forcing the motor engine. You can detect this when the scanner produces a "strange" noise and the carriage is at its maximum distance from home. In this situation, -.B turn off scanner power imediately, +.B turn off scanner power immediately, or you may risk damage your device. This seems to happen more often when scanning full pages at high resolutions. .SH "SEE ALSO" .BR sane (7),