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.
........
This commit is contained in:
Antoine Pitrou 2011-01-03 18:57:14 +00:00
parent 91ce0d933c
commit 31e8595e45
4 changed files with 7 additions and 3 deletions

View File

@ -301,6 +301,7 @@ David Goodger
Hans de Graaff Hans de Graaff
Eddy De Greef Eddy De Greef
Duncan Grisby Duncan Grisby
Fabian Groffen
Dag Gruneau Dag Gruneau
Michael Guravage Michael Guravage
Lars Gustäbel Lars Gustäbel

View File

@ -105,6 +105,9 @@ Extension Modules
Build 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 - Issue #10475: Don't hardcode compilers for LDSHARED/LDCXXSHARED on NetBSD
and DragonFly BSD. Patch by Nicolas Joly. and DragonFly BSD. Patch by Nicolas Joly.

4
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 87640 . # From configure.in Revision: 87650 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for python 2.7. # Generated by GNU Autoconf 2.65 for python 2.7.
# #
@ -9179,7 +9179,7 @@ rm -f conftest*
;; ;;
solaris) solaris)
if test -f /etc/netconfig; then 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 ipv6type=$i
ipv6trylibc=yes ipv6trylibc=yes
fi fi

View File

@ -2503,7 +2503,7 @@ yes
;; ;;
solaris) solaris)
if test -f /etc/netconfig; then 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 ipv6type=$i
ipv6trylibc=yes ipv6trylibc=yes
fi fi