Merged main branch with current DEVEL_1_9.

configure.in

@@ -7,7 +7,7 @@ AC_ARG_PROGRAM
 # version code:
 V_MAJOR=1
 V_MINOR=0
-V_REV=1
+V_REV=2
 
 PACKAGE=sane
 VERSION=${V_MAJOR}.${V_MINOR}.${V_REV}
@@ -21,6 +21,7 @@ AC_SUBST(PACKAGE_VERSION)
 
 dnl Checks for programs.
 AC_PROG_CC
+AC_PROG_LD
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_CPP
@@ -28,13 +29,23 @@ AC_PROG_GCC_TRADITIONAL
 AC_AIX
 AC_MINIX
 AC_ISC_POSIX
+AM_PROG_CC_STDC
 
 INCLUDES="${INCLUDES} -I/usr/local/include"
 CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE"
-if test "${ac_cv_prog_gcc}" = "yes"; then
-  CFLAGS="${CFLAGS} -Wall"
-fi
 
+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"
+
+  # 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
 AC_CHECK_HEADERS(fcntl.h unistd.h libintl.h libc.h sys/dsreq.h sys/select.h \
@@ -42,7 +53,8 @@ AC_CHECK_HEADERS(fcntl.h unistd.h libintl.h libc.h sys/dsreq.h sys/select.h \
     sys/scanio.h scsi.h sys/scsi.h sys/scsicmd.h sys/scsiio.h \
     bsd/dev/scsireg.h scsi/sg.h /usr/src/linux/include/scsi/sg.h io/cam/cam.h \
     camlib.h os2.h sys/socket.h sys/io.h asm/io.h gscdds.h sys/hw.h \
-    sys/types.h sys/scsi/sgdefs.h sys/scsi/targets/scgio.h apollo/scsi.h)
+    sys/types.h sys/scsi/sgdefs.h sys/scsi/targets/scgio.h apollo/scsi.h \
+    sys/sdi_comm.h sys/passthrudef.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -68,6 +80,7 @@ fi
 dnl Checks for libraries.
 
 AC_CHECK_LIB(scsi, scsireq_enter)	# FreeBSD needs this
+AC_CHECK_LIB(cam, cam_open_device)      # FreeBSD 3+ needs this
 AC_CHECK_LIB(m,sqrt)
 AC_CHECK_LIB(intl,gettext)
 AC_CHECK_LIB(syslog,syslog)             # OS/2 needs this
@@ -81,13 +94,14 @@ if test "`uname`" != "IRIX" -a "`uname`" != "IRIX64"; then
 fi
 
 dnl Checks for library functions.
-AM_FUNC_ALLOCA
+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)
 
 dnl initialize libtool
+AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 
 dnl Checks for libraries.
@@ -125,6 +139,7 @@ if test "${HAVE_GTK}" = "yes"; then
   saved_CPPFLAGS="${CPPFLAGS}"
   saved_LIBS="${LIBS}"
   CPPFLAGS="${CPPFLAGS} ${GTK_CFLAGS}"
+  SANE_EXTRACT_LDFLAGS(LDFLAGS, GTK_LIBS)
   LIBS="${LIBS} ${GTK_LIBS}"
 
   AC_CHECK_FUNCS(gtk_tooltips_set_tips gtk_events_pending)
@@ -192,6 +207,14 @@ if test "${enable_dynamic}" != yes || test "${enable_preload}" = "yes"; then
 else
   DLL_PRELOAD=""
 fi
+
+AC_ARG_ENABLE(scsibuffersize, 
+  [  --enable-scsibuffersize=N 
+                        specify the default size of the buffer for SCSI commands],
+  [set_scsibuffersize="$enableval"], [set_scsibuffersize=131072])
+CFLAGS="$CFLAGS -DSCSIBUFFERSIZE=$set_scsibuffersize"
+echo "scsi buffersize: $set_scsibuffersize"
+
 AC_SUBST(V_MAJOR)
 AC_SUBST(V_MINOR)
 AC_SUBST(V_REV)
@@ -199,7 +222,7 @@ AC_SUBST(DLL_PRELOAD)
 
 AC_OUTPUT([Makefile lib/Makefile sanei/Makefile frontend/Makefile
 	   japi/Makefile backend/Makefile include/Makefile doc/Makefile
-	   tools/Makefile],)
+	   tools/Makefile tools/sane-config],)
 
 echo "****************************************************************"
 echo "* Please be sure to read file PROBLEMS in this directory       *"