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 433d9bf03cc0e4a28ca0bb402467d5a63d99f8d6..ef5fce89ff0ce3f645a6c86259505b8ab379de9d 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -295,6 +295,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 f9dd5a10270c228c830a779f300390c4244a173f..bbedc77bca547ec0b6a3e4a66ea7bb38c40c83c5 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -96,6 +96,9 @@ Extensions
 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 cf6a23b914b95ab135a059d63ad7bd9b94eaad85..31a430817ce0277f442805f446af5402dda5317c 100755 (executable)
--- a/configure
+++ b/configure
@@ -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 @@ 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 e6be5ca66b1215a7f6af0744160e151e87e39733..5c35af2d349e067088c3c510653a109a31c68df0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2385,7 +2385,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