Patch #1432345: Make python compile on DragonFly.

diff --git a/Misc/NEWS b/Misc/NEWS
index ea6876355accb411fa02fd46836c7cb03457e02f..5a248613d627fd4f2ce914e289c52892c799a137 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -115,6 +115,8 @@ Tools/Demos
 Build
 -----
 
+- Patch #1432345: Make python compile on DragonFly.
+
 - Patch #1428494: Prefer linking against ncursesw over ncurses library.
 
 What's New in Python 2.4.2 final?

diff --git a/configure b/configure
index bf10dc1a86a6300929d95e989852550b70d5ebf5..a00c15424c8a59aedf2845390efff6e94b9a8148 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 41976 .
+# From configure.in Revision: 41985 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for python 2.4.
 #
@@ -3413,7 +3413,7 @@ _ACEOF
          RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
          INSTSONAME="$LDLIBRARY".$SOVERSION
           ;;
-    Linux*|GNU*|NetBSD*|FreeBSD*)
+    Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*)
          LDLIBRARY='libpython$(VERSION).so'
          BLDLIBRARY='-L. -lpython$(VERSION)'
          RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
@@ -10387,7 +10387,7 @@ then
                else
                        LDSHARED="ld -Bshareable ${LDFLAGS}"
                fi;;
-       NetBSD*) LDSHARED="cc -shared ${LDFLAGS}";;
+       NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
        OpenUNIX*|UnixWare*)
                if test "$GCC" = "yes"
                then LDSHARED='$(CC) -shared'
@@ -10420,7 +10420,7 @@ then
                 fi;;
        Linux*|GNU*) CCSHARED="-fPIC";;
        BSD/OS*/4*) CCSHARED="-fpic";;
-       FreeBSD*|NetBSD*|OpenBSD*) CCSHARED="-fPIC";;
+       FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
        OpenUNIX*|UnixWare*)
                if test "$GCC" = "yes"
                then CCSHARED="-fPIC"
@@ -10473,7 +10473,7 @@ then
        OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
        SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
        ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
-       FreeBSD*|NetBSD*|OpenBSD*)
+       FreeBSD*|NetBSD*|OpenBSD*|DragonFly*)
                if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
                then
                        LINKFORSHARED="-Wl,--export-dynamic"
@@ -14347,6 +14347,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include "confdefs.h"
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

diff --git a/configure.in b/configure.in
index 66e2d86fd8bd02e80a9373c2bebe231d3b553081..bcb07e6fcf59f58ac5d40188eaa754b43d6078a2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -576,7 +576,7 @@ if test $enable_shared = "yes"; then
          RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
          INSTSONAME="$LDLIBRARY".$SOVERSION
           ;;
-    Linux*|GNU*|NetBSD*|FreeBSD*)
+    Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*)
          LDLIBRARY='libpython$(VERSION).so'
          BLDLIBRARY='-L. -lpython$(VERSION)'
          RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
@@ -1387,7 +1387,7 @@ then
                else
                        LDSHARED="ld -Bshareable ${LDFLAGS}"
                fi;;
-       NetBSD*) LDSHARED="cc -shared ${LDFLAGS}";;
+       NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
        OpenUNIX*|UnixWare*)
                if test "$GCC" = "yes"
                then LDSHARED='$(CC) -shared'
@@ -1418,7 +1418,7 @@ then
                 fi;;
        Linux*|GNU*) CCSHARED="-fPIC";;
        BSD/OS*/4*) CCSHARED="-fpic";;
-       FreeBSD*|NetBSD*|OpenBSD*) CCSHARED="-fPIC";;
+       FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
        OpenUNIX*|UnixWare*)
                if test "$GCC" = "yes"
                then CCSHARED="-fPIC"
@@ -1469,7 +1469,7 @@ then
        OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
        SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
        ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
-       FreeBSD*|NetBSD*|OpenBSD*) 
+       FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) 
                if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
                then
                        LINKFORSHARED="-Wl,--export-dynamic"
@@ -2219,6 +2219,7 @@ AC_TRY_LINK([
 AC_MSG_CHECKING(for inet_aton)
 AC_TRY_LINK([
 #include "confdefs.h" 
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>