diff --git a/configure b/configure
index 70d5cb565e2..d736fb7705a 100755
--- 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 219e9256f81..9c8bde224db 100644
--- 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)