Backport of 46608: Port to OpenBSD 3.9.

diff --git a/Misc/NEWS b/Misc/NEWS
index 392e37f5922daf0001242e2f8e0c928b87c37441..e9b9b114c29f20f2398233ade217a41479df7500 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -60,6 +60,8 @@ Tools/Demos
 Build
 -----
 
+- OpenBSD 3.9 is now supported.
+
 - Test for sys/statvfs.h before including it, as statvfs is present
   on some OSX installation, but its header file is not.
 

diff --git a/configure b/configure
index 8c746719586837f6e91d924e1a12a977ce7fa2d6..701ac82fc65a0d4525075a6d0d55e1dd8c6b80c3 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 43618 .
+# From configure.in Revision: 46011 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for python 2.4.
 #
@@ -1480,7 +1480,7 @@ case $ac_sys_system/$ac_sys_release in
   # On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined,
   # even though select is a POSIX function. Reported by J. Ribbens.
   # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
-  OpenBSD/2.* | OpenBSD/3.[012345678])
+  OpenBSD/2.* | OpenBSD/3.[0123456789])
     define_xopen_source=no;;
   # On Solaris 2.6, sys/wait.h is inconsistent in the usage
   # of union __?sigval. Reported by Stuart Bishop.
@@ -10386,13 +10386,27 @@ then
                ;;
        Linux*|GNU*) LDSHARED='$(CC) -shared';;
        BSD/OS*/4*) LDSHARED="gcc -shared";;
-       OpenBSD*|FreeBSD*)
+       FreeBSD*)
                if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
                then
                        LDSHARED="$CC -shared ${LDFLAGS}"
                else
                        LDSHARED="ld -Bshareable ${LDFLAGS}"
                fi;;
+       OpenBSD*)
+               if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
+               then
+                               LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
+               else
+                               case `uname -r` in
+                               [01].* | 2.[0-7] | 2.[0-7].*)
+                                  LDSHARED="ld -Bshareable ${LDFLAGS}"
+                                  ;;
+                               *)
+                                  LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
+                                  ;;
+                               esac
+               fi;;
        NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
        OpenUNIX*|UnixWare*)
                if test "$GCC" = "yes"

diff --git a/configure.in b/configure.in
index 30284b468627ca6095d35aa0c5adf9a992966bf3..4a75be89ad88fb5141ca260f7a10cb1172b0ad42 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -140,7 +140,7 @@ case $ac_sys_system/$ac_sys_release in
   # On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined,
   # even though select is a POSIX function. Reported by J. Ribbens.
   # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
-  OpenBSD/2.* | OpenBSD/3.@<:@012345678@:>@) 
+  OpenBSD/2.* | OpenBSD/3.@<:@0123456789@:>@) 
     define_xopen_source=no;;
   # On Solaris 2.6, sys/wait.h is inconsistent in the usage
   # of union __?sigval. Reported by Stuart Bishop.
@@ -1385,13 +1385,27 @@ then
                ;;
        Linux*|GNU*) LDSHARED='$(CC) -shared';;
        BSD/OS*/4*) LDSHARED="gcc -shared";;
-       OpenBSD*|FreeBSD*)
+       FreeBSD*)
                if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
                then
                        LDSHARED="$CC -shared ${LDFLAGS}"
                else
                        LDSHARED="ld -Bshareable ${LDFLAGS}"
                fi;;
+       OpenBSD*)
+               if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
+               then
+                               LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
+               else
+                               case `uname -r` in
+                               [[01]].* | 2.[[0-7]] | 2.[[0-7]].*)
+                                  LDSHARED="ld -Bshareable ${LDFLAGS}"
+                                  ;;
+                               *)
+                                  LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
+                                  ;;
+                               esac
+               fi;;
        NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
        OpenUNIX*|UnixWare*)
                if test "$GCC" = "yes"