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.
........

diff --git a/Misc/ACKS b/Misc/ACKS
index b6fd1a890522dce9e0622f8c910047bbf7563c0f..fbe650d57f6995bbfdd86eb450ecc1f4585cbadc 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -301,6 +301,7 @@ David Goodger
 Hans de Graaff
 Eddy De Greef
 Duncan Grisby
+Fabian Groffen
 Dag Gruneau
 Michael Guravage
 Lars Gustäbel

diff --git a/Misc/NEWS b/Misc/NEWS
index c6faa12528aff51c2a222c33712ef9a198bfbedc..22810fe5e229e429821a65c98770f39cc3f3e4fd 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -105,6 +105,9 @@ Extension Modules
 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.
 

diff --git a/configure b/configure
index f37819d84457203274eae693ab2f99e7bad89139..9e680521f3132782309792ac48ea3a9a19774315 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 87640 .
+# From configure.in Revision: 87650 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for python 2.7.
 #
@@ -9179,7 +9179,7 @@ rm -f conftest*
                        ;;
                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

diff --git a/configure.in b/configure.in
index 144d0bdf22457eb77436c7ae52685c404ecdf022..9e6eeeb816980541caac9b50818fe85cddc62071 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2503,7 +2503,7 @@ yes
                        ;;
                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