Fix compilation on Tru64 by readding the sys/bitypes.h work-around. Minimum

autoconf version is 2.50 now

ChangeLog

@@ -1,3 +1,9 @@
+2002-11-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
+
+	* configure configure.in acinclude.m4 aclocal.m4 
+	  include/sane/config.h.in: Fix compilation on Tru64 by readding
+	  the sys/bitypes.h work-around. Minimum autoconf version is 2.50 now.
+
 2002-11-13  Ulrich Deiters <ukd@xenon.pc.uni-koeln.de>
 
 	* modified the Canon SCSI backend (now version 1.10):

acinclude.m4

@@ -198,6 +198,11 @@ AC_DEFUN(SANE_CHECK_U_TYPES,
   ],[AC_MSG_RESULT([no, also in standard headers])],
     [AC_EGREP_HEADER(u_int8_t,netinet/in.h,
        [AC_DEFINE(NEED_SYS_BITYPES_H, 1, [Do we need <sys/bitypes.h>?])
+	AH_VERBATIM([NEED_SYS_BITYPES_H_IF],
+         [/* Make sure that sys/bitypes.h is included on True64 */
+          #ifdef NEED_SYS_BITYPES_H
+          #include <sys/bitypes.h>
+          #endif])
 	AC_MSG_RESULT(yes)],
        [AC_MSG_RESULT([no, not even included with netinet/in.h])])])
 fi

aclocal.m4

@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
+dnl aclocal.m4 generated automatically by aclocal 1.4-p6
 
 dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -210,6 +210,11 @@ AC_DEFUN(SANE_CHECK_U_TYPES,
   ],[AC_MSG_RESULT([no, also in standard headers])],
     [AC_EGREP_HEADER(u_int8_t,netinet/in.h,
        [AC_DEFINE(NEED_SYS_BITYPES_H, 1, [Do we need <sys/bitypes.h>?])
+	AH_VERBATIM([NEED_SYS_BITYPES_H_IF],
+         [/* Make sure that sys/bitypes.h is included on True64 */
+          #ifdef NEED_SYS_BITYPES_H
+          #include <sys/bitypes.h>
+          #endif])
 	AC_MSG_RESULT(yes)],
        [AC_MSG_RESULT([no, not even included with netinet/in.h])])])
 fi
@@ -3744,14 +3749,7 @@ AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
 # This is just to silence aclocal about the macro not being used
 ifelse([AC_DISABLE_FAST_INSTALL])
 
-# isc-posix.m4 serial 1 (gettext-0.10.40)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
+#serial 1
 # This test replaces the one in autoconf.
 # Currently this macro should have the same name as the autoconf macro
 # because gettext's gettext.m4 (distributed in the automake package)

configure.in

@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script. -*-sh-*-
 AC_INIT(include/sane/sane.h)
 AC_CONFIG_HEADER(include/sane/config.h)
-AC_PREREQ(2.10)dnl		dnl Minimum Autoconf version required.
+AC_PREREQ(2.50)dnl		dnl Minimum Autoconf version required.
 AC_ARG_PROGRAM
 
 # version code:

include/sane/config.h.in

@@ -126,12 +126,6 @@
 /* Define to 1 if you have the <os2.h> header file. */
 #undef HAVE_OS2_H
 
-/* Is PTAL available? */
-#undef HAVE_PTAL
-
-/* Define to 1 if you have the <ptal.h> header file. */
-#undef HAVE_PTAL_H
-
 /* Define to 1 if you have the `scsireq_enter' function. */
 #undef HAVE_SCSIREQ_ENTER
 
@@ -280,6 +274,11 @@
 /* Do we need <sys/bitypes.h>? */
 #undef NEED_SYS_BITYPES_H
 
+/* Make sure that sys/bitypes.h is included on True64 */
+          #ifdef NEED_SYS_BITYPES_H
+          #include <sys/bitypes.h>
+          #endif
+
 /* Define to the name of the distribution. */
 #undef PACKAGE