Merge devel (v1.0.3) into head branch.

configure.in

@@ -7,7 +7,7 @@ AC_ARG_PROGRAM
 # version code:
 V_MAJOR=1
 V_MINOR=0
-V_REV=2
+V_REV=3
 
 PACKAGE=sane
 VERSION=${V_MAJOR}.${V_MINOR}.${V_REV}
@@ -36,15 +36,37 @@ CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE"
 
 if test "${ac_cv_prog_gcc}" = "yes"; then
 
-  # Always use these flags.
-  # -ansi does not accept inline, so we redefine it.
-  CFLAGS="${CFLAGS} -W -Wall"
+NORMAL_CFLAGS="${CFLAGS} -W -Wall"
+WARN_CFLAGS="${CFLAGS} -W -Wall -Wstrict-prototypes -Wreturn-type -Wcast-align \
+  -Wpointer-arith -Wcast-qual -ansi -pedantic"
+
+dnl Use this during development
+dnl # Warnings enabled by default
+dnl AC_ARG_ENABLE(warnings,
+dnl   [  --enable-warnings Turn on tons of compiler warnings (if you are using GCC) [default=yes]],
+dnl   [
+dnl     if eval "test x$enable_warnings = xyes"; then 
+dnl       CFLAGS="${WARN_CFLAGS}"
+dnl     else
+dnl       CFLAGS="${NORMAL_CFLAGS}"
+dnl     fi
+dnl   ],
+dnl   [CFLAGS="${WARN_CFLAGS}"])
+
+dnl Use this for releases
+# Warnings disabled by default
+AC_ARG_ENABLE(warnings,
+  [  --enable-warnings Turn on tons of compiler warnings (if you are using GCC) [default=no]],
+  [
+    if eval "test x$enable_warnings = xyes"; then 
+      CFLAGS="${WARN_CFLAGS}"
+    else
+      CFLAGS="${NORMAL_CFLAGS}"
+    fi
+  ],
+  [CFLAGS="${NORMAL_CFLAGS}"])
+  
 
-  # Use these flags during development
-  AC_ARG_ENABLE(warnings,
-    [  --enable-warnings Turn on tons of compiler warnings (if you're using GCC) [default=yes]],
-    [CFLAGS="${CFLAGS} -Wstrict-prototypes -Wreturn-type -Wcast-align \
-       -Wpointer-arith -Wcast-qual -ansi -pedantic"])
 fi
 dnl Checks for header files.
 AC_HEADER_STDC
@@ -66,6 +88,9 @@ AC_CHECK_TYPE(ssize_t, long)
 AC_CHECK_TYPE(u_char, unsigned char)
 AC_CHECK_TYPE(u_int, unsigned int)
 AC_CHECK_TYPE(u_long, unsigned long)
+AC_CHECK_TYPE(u_int8_t, unsigned char)
+AC_CHECK_TYPE(u_int16_t, unsigned short)
+AC_CHECK_TYPE(u_int32_t, unsigned int)
 
 if test "$ac_cv_header_sys_scsiio_h" = "yes" \
      -a "$ac_cv_header_scsi_h" = "yes";
@@ -77,6 +102,8 @@ then
    AC_DEFINE(scsireq_t, struct scsireq_t))
 fi
 
+SANE_V4L_VERSION
+
 dnl Checks for libraries.
 
 AC_CHECK_LIB(scsi, scsireq_enter)	# FreeBSD needs this
@@ -98,7 +125,8 @@ AC_FUNC_ALLOCA
 AC_FUNC_MMAP
 AC_CHECK_FUNCS(atexit ioperm mkdir scsireq_enter sigprocmask \
     strdup strndup strftime strstr strsep strtod snprintf \
-    cfmakeraw tcsendbreak usleep strcasecmp strncasecmp _portaccess)
+    cfmakeraw tcsendbreak usleep strcasecmp strncasecmp _portaccess \
+    getenv isfdtype vsyslog)
 
 dnl initialize libtool
 AC_LIBTOOL_WIN32_DLL
@@ -187,6 +215,15 @@ else
   QCAM=qcam
 fi
 AC_SUBST(QCAM)
+if test "${sane_v4l_version}" = "v4l"
+then
+  echo "enabling Video4Linux backend"
+  V4L=v4l
+else
+  echo "disabling Video4Linux backend"
+  V4L=
+fi
+AC_SUBST(V4L)
 if test "${ac_cv_header_sys_socket_h}" = "no"; then
   echo "disabling NET backend"
   NET=