From: Neal Norwitz <nnorwitz@gmail.com>
Date: Mon, 9 Jan 2006 07:10:56 +0000 (+0000)
Subject: Backport:
X-Git-Tag: v2.4.3c1~147
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ce8a8909f7c7f33fcfb022b6ca4aea97ab03d49;p=thirdparty%2FPython%2Fcpython.git

Backport:
Fix bugs #1244610, #1392915, fix build problem on OpenBSD 3.7 and 3.8.
configure would break checking curses.h.

Also fix whitespace consistency which I forgot to mention in the head checkin.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 948e1ffefe0d..b48ab29a174f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 2.4.3c1?
 Core and builtins
 -----------------
 
+- Bug #1244610, #1392915, fix build problem on OpenBSD 3.7 and 3.8.
+  configure would break checking curses.h.
+
 - Bug #959576: The pwd module is now builtin. This allows Python to be
   built on UNIX platforms without $HOME set.
 
diff --git a/configure b/configure
index 21ecad445ca3..bf10dc1a86a6 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 41853 .
+# From configure.in Revision: 41976 .
 # 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.[0123456])
+  OpenBSD/2.* | OpenBSD/3.[012345678])
     define_xopen_source=no;;
   # On Solaris 2.6, sys/wait.h is inconsistent in the usage
   # of union __?sigval. Reported by Stuart Bishop.
@@ -3431,7 +3431,7 @@ _ACEOF
 	  ;;
     OSF*)
 	  LDLIBRARY='libpython$(VERSION).so'
-         BLDLIBRARY='-rpath $(LIBDIR) -L. -lpython$(VERSION)'
+	  BLDLIBRARY='-rpath $(LIBDIR) -L. -lpython$(VERSION)'
 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
 	  ;;
     atheos*)
diff --git a/configure.in b/configure.in
index fdbc598435c5..66e2d86fd8bd 100644
--- 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.@<:@0123456@:>@) 
+  OpenBSD/2.* | OpenBSD/3.@<:@012345678@:>@) 
     define_xopen_source=no;;
   # On Solaris 2.6, sys/wait.h is inconsistent in the usage
   # of union __?sigval. Reported by Stuart Bishop.
@@ -594,7 +594,7 @@ if test $enable_shared = "yes"; then
 	  ;;
     OSF*)
 	  LDLIBRARY='libpython$(VERSION).so'
-         BLDLIBRARY='-rpath $(LIBDIR) -L. -lpython$(VERSION)'
+	  BLDLIBRARY='-rpath $(LIBDIR) -L. -lpython$(VERSION)'
 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
 	  ;;
     atheos*)