[Python-checkins] r41985 - in python/branches/release24-maint: Misc/NEWS configure configure.in

[neal.norwitz]

Author: neal.norwitz
Date: Mon Jan  9 08:10:56 2006
New Revision: 41985

Modified:
   python/branches/release24-maint/Misc/NEWS
   python/branches/release24-maint/configure
   python/branches/release24-maint/configure.in
Log:
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.



Modified: python/branches/release24-maint/Misc/NEWS
==============================================================================
--- python/branches/release24-maint/Misc/NEWS	(original)
+++ python/branches/release24-maint/Misc/NEWS	Mon Jan  9 08:10:56 2006
@@ -12,6 +12,9 @@
 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.
 

Modified: python/branches/release24-maint/configure
==============================================================================
--- python/branches/release24-maint/configure	(original)
+++ python/branches/release24-maint/configure	Mon Jan  9 08:10:56 2006
@@ -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 @@
   # 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 @@
 	  ;;
     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*)

Modified: python/branches/release24-maint/configure.in
==============================================================================
--- python/branches/release24-maint/configure.in	(original)
+++ python/branches/release24-maint/configure.in	Mon Jan  9 08:10:56 2006
@@ -140,7 +140,7 @@
   # 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 @@
 	  ;;
     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*)