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

diff --git a/configure b/configure
index 70d5cb565e290d7604d891ac377f500b80dd4112..d736fb7705af5ebec06e95f7d106bc32741b2512 100755 (executable)
--- a/configure
+++ b/configure
@@ -4533,7 +4533,7 @@ fi
 # 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)

diff --git a/configure.in b/configure.in
index 219e9256f812df60eed3927ebfd1c779fc4aa4a0..9c8bde224db19509748fc6781d6dc3879b09c394 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -828,7 +828,7 @@ fi],
 # 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)