diff --git a/configure b/configure
index 996593fc0f..654194ca13 100755
--- a/configure
+++ b/configure
@@ -17704,8 +17704,10 @@ echo "$as_me: WARNING: Could not determine deployment target from SDKSettings.pl
         wxUSE_MACOSX_VERSION_MIN=
     fi
 elif test "x$wxUSE_MACOSX_VERSION_MIN" == "x"; then
-    # otherwise configure stops on leopard for universal_binary
-    wxUSE_MACOSX_VERSION_MIN=10.4
+    if test "$wxUSE_MAC" = 1; then
+        # otherwise configure stops on leopard for universal_binary
+        wxUSE_MACOSX_VERSION_MIN=10.4
+    fi
 fi
 
 if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then
diff --git a/configure.in b/configure.in
index ecb459f8b3..0bb2d6a499 100644
--- a/configure.in
+++ b/configure.in
@@ -1188,9 +1188,11 @@ dnl We need to quote the next line where we don't need macros and do need [] in
     else
         wxUSE_MACOSX_VERSION_MIN=
     fi
-elif test "x$wxUSE_MACOSX_VERSION_MIN" == "x"; then
-    # otherwise configure stops on leopard for universal_binary
-    wxUSE_MACOSX_VERSION_MIN=10.4
+elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then
+    if test "$wxUSE_MAC" = 1; then
+        # otherwise configure stops on leopard for universal_binary
+        wxUSE_MACOSX_VERSION_MIN=10.4
+    fi
 fi
 
 if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then