Fix configure/compile problem on Alpha/Tru64 Unix.

acinclude.m4

@@ -175,7 +175,8 @@ AC_DEFUN(SANE_CHECK_U_TYPES,
   #endif
   ],[AC_MSG_RESULT([no, also in standard headers])],
     [AC_EGREP_HEADER(u_int8_t,netinet/in.h,
-       [CPPFLAGS="$CPPFLAGS -isys/bitypes.h"; AC_MSG_RESULT(yes)],
+       [AC_DEFINE(NEED_SYS_BITYPES_H, 1, [Do we need <sys/bitypes.h>?])
+	AC_MSG_RESULT(yes)],
        [AC_MSG_RESULT([no, not even included with netinet/in.h])])])
 fi
 AC_CHECK_TYPE(u_int8_t, unsigned char)

include/sane/config.h.in

@@ -46,6 +46,13 @@
 /* Define to `unsigned' if <sys/types.h> doesn't define.  */
 #undef size_t
 
+/* Do we need <sys/bitypes.h>? */
+#undef NEED_SYS_BITYPES_H
+
+#ifdef NEED_SYS_BITYPES_H
+# include <sys/bitypes.h>
+#else // not NEED_SYS_BITYPES_H
+
 /* Define to `unsigned char' if <sys/types.h> doesn't define.  */
 #undef u_char
 
@@ -55,6 +62,17 @@
 /* Define to `unsigned long' if <sys/types.h> doesn't define.  */
 #undef u_long
 
+/* Define to `unsigned char' if <sys/types.h> doesn't define. */
+#undef u_int8_t
+
+/* Define to `unsigned short' if <sys/types.h> doesn't define. */
+#undef u_int16_t
+
+/* Define to `unsigned int' if <sys/types.h> doesn't define. */
+#undef u_int32_t
+
+#endif // not NEED_SYS_BITYPES_H
+
 /* Define to `long' if <sys/types.h> doesn't define.  */
 #undef ssize_t
 
@@ -67,15 +85,6 @@
 /* Define scsireq_t as `struct scsireq' if necessary.  */
 #undef scsireq_t
 
-/* Define to `unsigned char' if <sys/types.h> doesn't define. */
-#undef u_int8_t
-
-/* Define to `unsigned short' if <sys/types.h> doesn't define. */
-#undef u_int16_t
-
-/* Define to `unsigned int' if <sys/types.h> doesn't define. */
-#undef u_int32_t
-
 /* Define to the return type of signal handlers. */
 #undef RETSIGTYPE