autofoo: Sync generated files

This pulls in the changes from 756d286f and e7d9779d.

configure

@@ -3368,7 +3368,7 @@ else
 fi
 V_MAJOR=`echo $VERSION | $AWK -F. '{print $1}'`
 V_MINOR=`echo $VERSION | $AWK -F. '{print $2}'`
-V_REV=`echo $VERSION | $AWK -F. '{print $3}' | sed 's/[^0-9]//g'`;
+V_REV=`echo $VERSION | $AWK -F. '{print $3}' | sed 's/^\([0-9]*\).*/\1/'`;
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16990,6 +16990,40 @@ done
 
   fi
 
+  # Based on a similar test for pthread_key_t from the Python project.
+  # See https://bugs.python.org/review/25658/patch/19209/75870
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_t is integer" >&5
+$as_echo_n "checking whether pthread_t is integer... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pthread.h>
+int
+main ()
+{
+pthread_t k; k * 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_pthread_t_is_integer=yes
+else
+  ac_pthread_t_is_integer=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pthread_t_is_integer" >&5
+$as_echo "$ac_pthread_t_is_integer" >&6; }
+  if test "$ac_pthread_t_is_integer" = yes ; then
+
+$as_echo "#define PTHREAD_T_IS_INTEGER 1" >>confdefs.h
+
+  else
+    # Until the sanei_thread implementation is fixed.
+    have_pthread=no
+    use_pthread=no
+  fi
+
   if test $use_pthread = yes ; then
 
 cat >>confdefs.h <<_ACEOF

include/sane/config.h.in

@@ -491,6 +491,9 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Define if pthread_t is integer. */
+#undef PTHREAD_T_IS_INTEGER
+
 /* SANE DLL revision number */
 #undef SANE_DLL_V_BUILD