summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-01-03 18:56:50 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-01-03 18:56:50 (GMT)
commita75c10526f178e3b570da95454d52220e7870ea6 (patch)
tree6afdb067b61e832f5fcd8380bb7368c362f20900 /configure
parentf50a6b6b6d5c7b36e7fbe49266edd3083a23cbb9 (diff)
downloadcpython-a75c10526f178e3b570da95454d52220e7870ea6.zip
cpython-a75c10526f178e3b570da95454d52220e7870ea6.tar.gz
cpython-a75c10526f178e3b570da95454d52220e7870ea6.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 cf6a23b..31a4308 100755
--- 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