Regenerated to include updates from niash and resource manager inclusion.

ChangeLog

@@ -1,3 +1,8 @@
+2004-08-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
+
+	* aclocal.m4 configure include/sane/config.h.in: Regenerated to
+	  include updates from niash and resource manager inclusion.
+
 2004-08-03  Gerhard Jaeger <gerhard@gjaeger.de>
 
 	* AUTHORS: Added niash backend maintainer and author.

include/sane/config.h.in

@@ -203,6 +203,9 @@
 /* Define to 1 if you have the `pthread_kill' function. */
 #undef HAVE_PTHREAD_KILL
 
+/* define if you have the resmgr library" */
+#undef HAVE_RESMGR
+
 /* Define to 1 if you have the `scsireq_enter' function. */
 #undef HAVE_SCSIREQ_ENTER
 
@@ -404,9 +407,9 @@
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at run-time.
-        STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION > 0 => grows toward higher addresses
-        STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
-        STACK_DIRECTION = 0 => direction of growth unknown */
+	STACK_DIRECTION = 0 => direction of growth unknown */
 #undef STACK_DIRECTION
 
 /* Define to 1 if you have the ANSI C header files. */
@@ -447,9 +450,11 @@
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+/* Define to `__inline__' or `__inline' if that's what the C compiler
-   if it is not supported. */
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
 #undef inline
+#endif
 
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t