[Python-checkins] r87699 - in python/branches/release31-maint: Misc/ACKS Misc/NEWS configure configure.in
antoine.pitrou
python-checkins at python.org
Mon Jan 3 19:56:50 CET 2011
Author: antoine.pitrou
Date: Mon Jan 3 19:56:50 2011
New Revision: 87699
Log:
Merged revisions 87698 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87698 | antoine.pitrou | 2011-01-03 19:53:50 +0100 (lun., 03 janv. 2011) | 4 lines
Issue #7716: Under Solaris, don't assume existence of /usr/xpg4/bin/grep in
the configure script but use $GREP instead. Patch by Fabian Groffen.
........
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/Misc/ACKS
python/branches/release31-maint/Misc/NEWS
python/branches/release31-maint/configure
python/branches/release31-maint/configure.in
Modified: python/branches/release31-maint/Misc/ACKS
==============================================================================
--- python/branches/release31-maint/Misc/ACKS (original)
+++ python/branches/release31-maint/Misc/ACKS Mon Jan 3 19:56:50 2011
@@ -295,6 +295,7 @@
Hans de Graaff
Eddy De Greef
Duncan Grisby
+Fabian Groffen
Dag Gruneau
Michael Guravage
Lars Gustäbel
Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS (original)
+++ python/branches/release31-maint/Misc/NEWS Mon Jan 3 19:56:50 2011
@@ -96,6 +96,9 @@
Build
-----
+- Issue #7716: Under Solaris, don't assume existence of /usr/xpg4/bin/grep in
+ the configure script but use $GREP instead. Patch by Fabian Groffen.
+
- Issue #10475: Don't hardcode compilers for LDSHARED/LDCXXSHARED on NetBSD
and DragonFly BSD. Patch by Nicolas Joly.
Modified: python/branches/release31-maint/configure
==============================================================================
--- python/branches/release31-maint/configure (original)
+++ python/branches/release31-maint/configure Mon Jan 3 19:56:50 2011
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 87641 .
+# From configure.in Revision: 87649 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for python 3.1.
#
@@ -8878,7 +8878,7 @@
;;
solaris)
if test -f /etc/netconfig; then
- if /usr/xpg4/bin/grep -q tcp6 /etc/netconfig; then
+ if $GREP -q tcp6 /etc/netconfig; then
ipv6type=$i
ipv6trylibc=yes
fi
Modified: python/branches/release31-maint/configure.in
==============================================================================
--- python/branches/release31-maint/configure.in (original)
+++ python/branches/release31-maint/configure.in Mon Jan 3 19:56:50 2011
@@ -2385,7 +2385,7 @@
;;
solaris)
if test -f /etc/netconfig; then
- if /usr/xpg4/bin/grep -q tcp6 /etc/netconfig; then
+ if $GREP -q tcp6 /etc/netconfig; then
ipv6type=$i
ipv6trylibc=yes
fi
More information about the Python-checkins
mailing list