Use new-style CHECK_TYPE to avoid modifying confdefs.h. Include sys/types.h

Fixes #636431.

diff --git a/configure b/configure
index 3c902f8c3fe4f06ace5d6153e32561262e8b961d..0638270d9b220a8d3aa5287511745b9cd05bb496 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.366 .
+# From configure.in Revision: 1.367 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53 for python 2.3.
 #
@@ -16525,13 +16525,6 @@ _ACEOF
 
 fi
 
-# THIS MUST BE LAST, IT CAN BREAK OTHER TESTS!
-# Add sys/socket.h to confdefs.h
-cat >> confdefs.h <<\EOF
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-EOF
 echo "$as_me:$LINENO: checking for socklen_t" >&5
 echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
 if test "${ac_cv_type_socklen_t+set}" = set; then
@@ -16540,7 +16533,15 @@ else
   cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 #include "confdefs.h"
-$ac_includes_default
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+
 #ifdef F77_DUMMY_MAIN
 #  ifdef __cplusplus
      extern "C"
@@ -16584,24 +16585,13 @@ if test $ac_cv_type_socklen_t = yes; then
   :
 else
 
-cat >>confdefs.h <<_ACEOF
+cat >>confdefs.h <<\_ACEOF
 #define socklen_t int
 _ACEOF
 
 fi
 
 
-#AC_MSG_CHECKING(for Modules/Setup)
-#if test ! -f Modules/Setup ; then
-#    if test ! -d Modules ; then
-#        mkdir Modules
-#    fi
-#    cp "$srcdir/Modules/Setup.dist" Modules/Setup
-#    AC_MSG_RESULT(creating)
-#else
-#    AC_MSG_RESULT(already exists)
-#fi
-
 
 
 for h in `(cd $srcdir;echo Python/thread_*.h)`

diff --git a/configure.in b/configure.in
index 07f452dd1b8c77cfb5fc21af86d9e9cb3527d5cd..2bfe8c37c79f820d902cd9382401e53c45c28f4c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2445,25 +2445,16 @@ then
   [Define if WINDOW in curses.h offers a field _flags.])
 fi
 
-# THIS MUST BE LAST, IT CAN BREAK OTHER TESTS!
-# Add sys/socket.h to confdefs.h
-cat >> confdefs.h <<\EOF
+AC_CHECK_TYPE(socklen_t,,
+  AC_DEFINE(socklen_t,int,
+            Define to `int' if <sys/socket.h> does not define.),[
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
-EOF
-AC_CHECK_TYPE(socklen_t, int)
-
-#AC_MSG_CHECKING(for Modules/Setup)
-#if test ! -f Modules/Setup ; then
-#    if test ! -d Modules ; then
-#        mkdir Modules
-#    fi
-#    cp "$srcdir/Modules/Setup.dist" Modules/Setup
-#    AC_MSG_RESULT(creating)
-#else
-#    AC_MSG_RESULT(already exists)
-#fi
+])
 
 AC_SUBST(THREADHEADERS)
 

diff --git a/pyconfig.h.in b/pyconfig.h.in
index a6f7e83e396d3f0705f2be0e22602a58afbca487..e612494ad24e214fc24d49350630b7b6808dcb90 100644 (file)
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -842,7 +842,7 @@
 /* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
 
-/* Define to `int' if <sys/types.h> does not define. */
+/* Define to `int' if <sys/socket.h> does not define. */
 #undef socklen_t
 
 /* Define to `int' if <sys/types.h> doesn't define. */