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

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

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.
 

configure

 #! /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

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