summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-01-03 18:57:14 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-01-03 18:57:14 (GMT)
commit31e8595e45a0b749f007727c82e57a5fc7f9a138 (patch)
tree968f161a5de8dd42194abe831e47a8fa86e01903 /configure
parent91ce0d933c1a993db23994c1ea53d7a666dce96c (diff)
downloadcpython-31e8595e45a0b749f007727c82e57a5fc7f9a138.zip
cpython-31e8595e45a0b749f007727c82e57a5fc7f9a138.tar.gz
cpython-31e8595e45a0b749f007727c82e57a5fc7f9a138.tar.bz2
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. ........
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index f37819d..9e68052 100755
--- 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