[Python-checkins] r78825 - in python/branches/release31-maint: configure configure.in

[benjamin.peterson]

Author: benjamin.peterson
Date: Wed Mar 10 23:28:52 2010
New Revision: 78825

Log:
Merged revisions 78818 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78818 | benjamin.peterson | 2010-03-09 15:46:49 -0600 (Tue, 09 Mar 2010) | 9 lines
  
  Merged revisions 78817 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r78817 | benjamin.peterson | 2010-03-09 15:43:36 -0600 (Tue, 09 Mar 2010) | 1 line
    
    handle an empty OPT variable correctly #8100
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/configure
   python/branches/release31-maint/configure.in

Modified: python/branches/release31-maint/configure
==============================================================================
--- python/branches/release31-maint/configure	(original)
+++ python/branches/release31-maint/configure	Wed Mar 10 23:28:52 2010
@@ -4533,7 +4533,7 @@
 # tweak OPT based on compiler and platform, only if the user didn't set
 # it on the command line
 
-if test -z "$OPT"
+if test "${OPT-unset}" == "unset"
 then
     case $GCC in
     yes)

Modified: python/branches/release31-maint/configure.in
==============================================================================
--- python/branches/release31-maint/configure.in	(original)
+++ python/branches/release31-maint/configure.in	Wed Mar 10 23:28:52 2010
@@ -828,7 +828,7 @@
 # tweak OPT based on compiler and platform, only if the user didn't set
 # it on the command line
 AC_SUBST(OPT)
-if test -z "$OPT"
+if test "${OPT-unset}" == "unset"
 then
     case $GCC in
     yes)