Added HAVE_LIBUSB #define. Added OS/2 substitution for strncasecmp.

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

configure.in

@@ -238,7 +238,13 @@ dnl Checks for Backend libraries.
 AC_CHECK_LIB(m,sqrt)
 AC_CHECK_LIB(scsi, scsireq_enter)	# FreeBSD needs this
 AC_CHECK_LIB(cam, cam_open_device)      # FreeBSD 3+ needs this
-AC_CHECK_LIB(usb, usb_open)
+
+if test "${ac_cv_header_usb_h}" = "yes" ; then
+  AC_CHECK_LIB(usb, usb_open)
+  if test "${ac_cv_lib_usb_usb_open}" = "yes" ; then
+    HAVE_LIBUSB="yes"
+  fi
+fi
 
 SANE_CHECK_JPEG
 
@@ -272,6 +278,10 @@ AC_CHECK_FUNCS(atexit inet_addr inet_aton inet_ntoa ioperm mkdir \
 AC_REPLACE_FUNCS(getenv inet_ntop inet_pton isfdtype sigprocmask snprintf \
     strdup strndup strsep usleep vsyslog)
 
+if test "$ac_cv_header_os2_h" == "yes" ; then
+  AC_DEFINE(strncasecmp,strnicmp,[Define for OS/2 only])
+fi
+
 SANE_LINKER_RPATH
 
 dnl initialize libtool
@@ -358,13 +368,12 @@ else
 fi
 AC_SUBST(NET)
 AC_SUBST(SANED)
-if test "${ac_cv_header_usb_h}" = "no" \
+if test "${HAVE_LIBUSB}" = "yes" ; then
-         -o "${ac_cv_lib_usb_usb_open}" = "no"; then
-  echo "disabling SM3600 backend"
-  SM3600=
-else
   echo "enabling SM3600 backend"
   SM3600=sm3600
+else
+  echo "disabling SM3600 backend"
+  SM3600=
 fi
 AC_SUBST(SM3600)
 if test "${ac_cv_header_sys_sem_h}" = "no" ; then

include/sane/config.h.in

@@ -1,278 +1,280 @@
-/* include/sane/config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* include/sane/config.h.in.  Generated from configure.in by autoheader.  */
 
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.
    */
 #undef CRAY_STACKSEG_END
 
-/* Define if using `alloca.c'. */
+/* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
 
-/* Define if you have `alloca', as a function or macro. */
+/* Define to 1 if you have `alloca', as a function or macro. */
 #undef HAVE_ALLOCA
 
-/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+   */
 #undef HAVE_ALLOCA_H
 
-/* Define if you have the <apollo/scsi.h> header file. */
+/* Define to 1 if you have the <apollo/scsi.h> header file. */
 #undef HAVE_APOLLO_SCSI_H
 
 /* Define if you have the <asm/io.h> header file. */
 #undef HAVE_ASM_IO_H
 
-/* Define if you have the `atexit' function. */
+/* Define to 1 if you have the `atexit' function. */
 #undef HAVE_ATEXIT
 
-/* Define if you have the <bsd/dev/scsireg.h> header file. */
+/* Define to 1 if you have the <bsd/dev/scsireg.h> header file. */
 #undef HAVE_BSD_DEV_SCSIREG_H
 
-/* Define if you have the <camlib.h> header file. */
+/* Define to 1 if you have the <camlib.h> header file. */
 #undef HAVE_CAMLIB_H
 
-/* Define if you have the `cfmakeraw' function. */
+/* Define to 1 if you have the `cfmakeraw' function. */
 #undef HAVE_CFMAKERAW
 
 /* Is /dev/urandom available? */
 #undef HAVE_DEV_URANDOM
 
-/* Define if you have the <dlfcn.h> header file. */
+/* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
-/* Define if you have the `dlopen' function. */
+/* Define to 1 if you have the `dlopen' function. */
 #undef HAVE_DLOPEN
 
-/* Define if you have the <dl.h> header file. */
+/* Define to 1 if you have the <dl.h> header file. */
 #undef HAVE_DL_H
 
-/* Define if you have the <fcntl.h> header file. */
+/* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
-/* Define if you have the `getenv' function. */
+/* Define to 1 if you have the `getenv' function. */
 #undef HAVE_GETENV
 
-/* Define if you have the `getpagesize' function. */
+/* Define to 1 if you have the `getpagesize' function. */
 #undef HAVE_GETPAGESIZE
 
-/* Define if you have the <gscdds.h> header file. */
+/* Define to 1 if you have the <gscdds.h> header file. */
 #undef HAVE_GSCDDS_H
 
-/* Define if you have the `inet_addr' function. */
+/* Define to 1 if you have the `inet_addr' function. */
 #undef HAVE_INET_ADDR
 
-/* Define if you have the `inet_aton' function. */
+/* Define to 1 if you have the `inet_aton' function. */
 #undef HAVE_INET_ATON
 
-/* Define if you have the `inet_ntoa' function. */
+/* Define to 1 if you have the `inet_ntoa' function. */
 #undef HAVE_INET_NTOA
 
-/* Define if you have the `inet_ntop' function. */
+/* Define to 1 if you have the `inet_ntop' function. */
 #undef HAVE_INET_NTOP
 
-/* Define if you have the `inet_pton' function. */
+/* Define to 1 if you have the `inet_pton' function. */
 #undef HAVE_INET_PTON
 
-/* Define if you have the <inttypes.h> header file. */
+/* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define if you have the `ioperm' function. */
+/* Define to 1 if you have the `ioperm' function. */
 #undef HAVE_IOPERM
 
-/* Define if you have the <io/cam/cam.h> header file. */
+/* Define to 1 if you have the <io/cam/cam.h> header file. */
 #undef HAVE_IO_CAM_CAM_H
 
-/* Define if you have the `isfdtype' function. */
+/* Define to 1 if you have the `isfdtype' function. */
 #undef HAVE_ISFDTYPE
 
-/* Define if you have the `cam' library (-lcam). */
+/* Define to 1 if you have the `cam' library (-lcam). */
 #undef HAVE_LIBCAM
 
-/* Define if you have the <libc.h> header file. */
+/* Define to 1 if you have the <libc.h> header file. */
 #undef HAVE_LIBC_H
 
-/* Define if you have the `m' library (-lm). */
+/* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM
 
-/* Define if you have the `nsl' library (-lnsl). */
+/* Define to 1 if you have the `nsl' library (-lnsl). */
 #undef HAVE_LIBNSL
 
-/* Define if you have the `scsi' library (-lscsi). */
+/* Define to 1 if you have the `scsi' library (-lscsi). */
 #undef HAVE_LIBSCSI
 
-/* Define if you have the `socket' library (-lsocket). */
+/* Define to 1 if you have the `socket' library (-lsocket). */
 #undef HAVE_LIBSOCKET
 
-/* Define if you have the `syslog' library (-lsyslog). */
+/* Define to 1 if you have the `syslog' library (-lsyslog). */
 #undef HAVE_LIBSYSLOG
 
-/* Define if you have the `usb' library (-lusb). */
+/* Define to 1 if you have the `usb' library (-lusb). */
 #undef HAVE_LIBUSB
 
-/* Define if you have the <linux/ppdev.h> header file. */
+/* Define to 1 if you have the <linux/ppdev.h> header file. */
 #undef HAVE_LINUX_PPDEV_H
 
 /* Define if the long long type is available. */
 #undef HAVE_LONG_LONG
 
-/* Define if you have the <memory.h> header file. */
+/* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
-/* Define if you have the `mkdir' function. */
+/* Define to 1 if you have the `mkdir' function. */
 #undef HAVE_MKDIR
 
-/* Define if you have a working `mmap' system call. */
+/* Define to 1 if you have a working `mmap' system call. */
 #undef HAVE_MMAP
 
-/* Define if you have the <os2.h> header file. */
+/* Define to 1 if you have the <os2.h> header file. */
 #undef HAVE_OS2_H
 
 /* Is PTAL available? */
 #undef HAVE_PTAL
 
-/* Define if you have the <ptal.h> header file. */
+/* Define to 1 if you have the <ptal.h> header file. */
 #undef HAVE_PTAL_H
 
-/* Define if you have the `scsireq_enter' function. */
+/* Define to 1 if you have the `scsireq_enter' function. */
 #undef HAVE_SCSIREQ_ENTER
 
-/* Define if you have the <scsi.h> header file. */
+/* Define to 1 if you have the <scsi.h> header file. */
 #undef HAVE_SCSI_H
 
-/* Define if you have the <scsi/sg.h> header file. */
+/* Define to 1 if you have the <scsi/sg.h> header file. */
 #undef HAVE_SCSI_SG_H
 
 /* Define if sg_header.target_status is available. */
 #undef HAVE_SG_TARGET_STATUS
 
-/* Define if you have the `shl_load' function. */
+/* Define to 1 if you have the `shl_load' function. */
 #undef HAVE_SHL_LOAD
 
-/* Define if you have the `sigprocmask' function. */
+/* Define to 1 if you have the `sigprocmask' function. */
 #undef HAVE_SIGPROCMASK
 
-/* Define if you have the `snprintf' function. */
+/* Define to 1 if you have the `snprintf' function. */
 #undef HAVE_SNPRINTF
 
-/* Define if you have the <stdint.h> header file. */
+/* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
-/* Define if you have the <stdlib.h> header file. */
+/* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* Define if you have the `strcasecmp' function. */
+/* Define to 1 if you have the `strcasecmp' function. */
 #undef HAVE_STRCASECMP
 
-/* Define if you have the `strdup' function. */
+/* Define to 1 if you have the `strdup' function. */
 #undef HAVE_STRDUP
 
-/* Define if you have the `strftime' function. */
+/* Define to 1 if you have the `strftime' function. */
 #undef HAVE_STRFTIME
 
-/* Define if you have the <strings.h> header file. */
+/* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
-/* Define if you have the <string.h> header file. */
+/* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define if you have the `strncasecmp' function. */
+/* Define to 1 if you have the `strncasecmp' function. */
 #undef HAVE_STRNCASECMP
 
-/* Define if you have the `strndup' function. */
+/* Define to 1 if you have the `strndup' function. */
 #undef HAVE_STRNDUP
 
-/* Define if you have the `strsep' function. */
+/* Define to 1 if you have the `strsep' function. */
 #undef HAVE_STRSEP
 
-/* Define if you have the `strstr' function. */
+/* Define to 1 if you have the `strstr' function. */
 #undef HAVE_STRSTR
 
-/* Define if you have the `strtod' function. */
+/* Define to 1 if you have the `strtod' function. */
 #undef HAVE_STRTOD
 
 /* Define if struct flock is available. */
 #undef HAVE_STRUCT_FLOCK
 
-/* Define if you have the <sys/bitypes.h> header file. */
+/* Define to 1 if you have the <sys/bitypes.h> header file. */
 #undef HAVE_SYS_BITYPES_H
 
-/* Define if you have the <sys/dsreq.h> header file. */
+/* Define to 1 if you have the <sys/dsreq.h> header file. */
 #undef HAVE_SYS_DSREQ_H
 
-/* Define if you have the <sys/hw.h> header file. */
+/* Define to 1 if you have the <sys/hw.h> header file. */
 #undef HAVE_SYS_HW_H
 
-/* Define if you have the <sys/io.h> header file. */
+/* Define to 1 if you have the <sys/io.h> header file. */
 #undef HAVE_SYS_IO_H
 
-/* Define if you have the <sys/passthrudef.h> header file. */
+/* Define to 1 if you have the <sys/passthrudef.h> header file. */
 #undef HAVE_SYS_PASSTHRUDEF_H
 
-/* Define if you have the <sys/scanio.h> header file. */
+/* Define to 1 if you have the <sys/scanio.h> header file. */
 #undef HAVE_SYS_SCANIO_H
 
-/* Define if you have the <sys/scsicmd.h> header file. */
+/* Define to 1 if you have the <sys/scsicmd.h> header file. */
 #undef HAVE_SYS_SCSICMD_H
 
-/* Define if you have the <sys/scsiio.h> header file. */
+/* Define to 1 if you have the <sys/scsiio.h> header file. */
 #undef HAVE_SYS_SCSIIO_H
 
-/* Define if you have the <sys/scsi.h> header file. */
+/* Define to 1 if you have the <sys/scsi.h> header file. */
 #undef HAVE_SYS_SCSI_H
 
-/* Define if you have the <sys/scsi/scsi.h> header file. */
+/* Define to 1 if you have the <sys/scsi/scsi.h> header file. */
 #undef HAVE_SYS_SCSI_SCSI_H
 
-/* Define if you have the <sys/scsi/sgdefs.h> header file. */
+/* Define to 1 if you have the <sys/scsi/sgdefs.h> header file. */
 #undef HAVE_SYS_SCSI_SGDEFS_H
 
-/* Define if you have the <sys/scsi/targets/scgio.h> header file. */
+/* Define to 1 if you have the <sys/scsi/targets/scgio.h> header file. */
 #undef HAVE_SYS_SCSI_TARGETS_SCGIO_H
 
-/* Define if you have the <sys/sdi_comm.h> header file. */
+/* Define to 1 if you have the <sys/sdi_comm.h> header file. */
 #undef HAVE_SYS_SDI_COMM_H
 
-/* Define if you have the <sys/select.h> header file. */
+/* Define to 1 if you have the <sys/select.h> header file. */
 #undef HAVE_SYS_SELECT_H
 
-/* Define if you have the <sys/sem.h> header file. */
+/* Define to 1 if you have the <sys/sem.h> header file. */
 #undef HAVE_SYS_SEM_H
 
-/* Define if you have the <sys/shm.h> header file. */
+/* Define to 1 if you have the <sys/shm.h> header file. */
 #undef HAVE_SYS_SHM_H
 
-/* Define if you have the <sys/socket.h> header file. */
+/* Define to 1 if you have the <sys/socket.h> header file. */
 #undef HAVE_SYS_SOCKET_H
 
-/* Define if you have the <sys/stat.h> header file. */
+/* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
-/* Define if you have the <sys/time.h> header file. */
+/* Define to 1 if you have the <sys/time.h> header file. */
 #undef HAVE_SYS_TIME_H
 
-/* Define if you have the <sys/types.h> header file. */
+/* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
-/* Define if you have the `tcsendbreak' function. */
+/* Define to 1 if you have the `tcsendbreak' function. */
 #undef HAVE_TCSENDBREAK
 
 /* Define if union semun is available. */
 #undef HAVE_UNION_SEMUN
 
-/* Define if you have the <unistd.h> header file. */
+/* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define if you have the <usb.h> header file. */
+/* Define to 1 if you have the <usb.h> header file. */
 #undef HAVE_USB_H
 
-/* Define if you have the `usleep' function. */
+/* Define to 1 if you have the `usleep' function. */
 #undef HAVE_USLEEP
 
-/* Define if you have the `vsyslog' function. */
+/* Define to 1 if you have the `vsyslog' function. */
 #undef HAVE_VSYSLOG
 
-/* Define if you have the `_portaccess' function. */
+/* Define to 1 if you have the `_portaccess' function. */
 #undef HAVE__PORTACCESS
 
-/* Define if you have the </usr/src/linux/include/scsi/sg.h> header file. */
+/* Define to 1 if you have the </usr/src/linux/include/scsi/sg.h> header file.
+   */
 #undef HAVE__USR_SRC_LINUX_INCLUDE_SCSI_SG_H
 
 /* Do we need <sys/bitypes.h>? */
@@ -281,6 +283,18 @@
 /* Define to the name of the distribution. */
 #undef PACKAGE
 
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
 /* The concatenation of the strings PACKAGE, "-", and VERSION. */
 #undef PACKAGE_VERSION
 
@@ -307,31 +321,31 @@
         STACK_DIRECTION = 0 => direction of growth unknown */
 #undef STACK_DIRECTION
 
-/* Define if you have the ANSI C header files. */
+/* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
 /* Define to the version of the distribution. */
 #undef VERSION
 
-/* Define if your processor stores words with the most significant byte first
+/* Define to 1 if your processor stores words with the most significant byte
-   (like Motorola and SPARC, unlike Intel and VAX). */
+   first (like Motorola and SPARC, unlike Intel and VAX). */
 #undef WORDS_BIGENDIAN
 
-/* Define if on AIX 3.
+/* Define to 1 if on AIX 3.
    System headers sometimes define this.
    We just want to avoid a redefinition error message.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
 
-/* Define if on MINIX. */
+/* Define to 1 if on MINIX. */
 #undef _MINIX
 
-/* Define if the system does not provide POSIX.1 features except with this
+/* Define to 2 if the system does not provide POSIX.1 features except with
-   defined. */
+   this defined. */
 #undef _POSIX_1_SOURCE
 
-/* Define if you need to in order for stat and other things to work. */
+/* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
 /* Define to empty if `const' does not conform to ANSI C. */
@@ -344,18 +358,21 @@
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
 
-/* Define scsireq_t as `struct scsireq\' if necessary. */
+/* Define scsireq_t as `struct scsireq' if necessary. */
 #undef scsireq_t
 
 /* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
 
-/* Define socklen_t as `int\' if necessary. */
+/* Define socklen_t as `int' if necessary. */
 #undef socklen_t
 
 /* Define to `long' if <sys/types.h> does not define. */
 #undef ssize_t
 
+/* Define for OS/2 only */
+#undef strncasecmp
+
 /* Define to `unsigned char' if <sys/types.h> does not define. */
 #undef u_char