Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct wxUSE_MACOSX_VERSION_MIN setting when running under OS X 10.4.

Browse Source 
sw_vers outputs e.g. 10.4.11 under 10.4 so comparing its result with just 10.4
is wrong, match it against "10.4*" using case instead to ensure that 10.4.11
is indeed recognized as 10.4.

Closes #11579.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-12-27 19:40:15 +00:00
parent 4d056a68ad
commit a49318f1c9
2 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
configure vendored
View File

@@ -18497,13 +18497,22 @@ done
echo "$as_me: WARNING: Assuming OS X 10.4, use --with-macosx-version-min to override." >&2;} echo "$as_me: WARNING: Assuming OS X 10.4, use --with-macosx-version-min to override." >&2;}
OSX_VERSION="10.4" OSX_VERSION="10.4"
fi fi
if test "$wxUSE_OSX_CARBON" = 1 -o "x$OSX_VERSION" = "x10.4"; then
# otherwise configure stops on leopard for universal_binary case "$OSX_VERSION" in
wxUSE_MACOSX_VERSION_MIN=10.4 10.4* )
else wxUSE_MACOSX_VERSION_MIN=10.4
# for OS X Cocoa, use 10.5 so we can get 64-bit compile on Snow Leopard ;;
wxUSE_MACOSX_VERSION_MIN=10.5
fi * )
if test "$wxUSE_OSX_CARBON" = 1; then
# otherwise configure stops on leopard for universal_binary
wxUSE_MACOSX_VERSION_MIN=10.4
else
# for Cocoa, use 10.5 to be able to compile it in 64 bits too
wxUSE_MACOSX_VERSION_MIN=10.5
fi
;;
esac
fi fi
NEEDS_GCC40="no" NEEDS_GCC40="no"

23
configure.in
View File

@@ -1229,13 +1229,22 @@ elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then
AC_MSG_WARN([Assuming OS X 10.4, use --with-macosx-version-min to override.]) AC_MSG_WARN([Assuming OS X 10.4, use --with-macosx-version-min to override.])
OSX_VERSION="10.4" OSX_VERSION="10.4"
fi fi
if test "$wxUSE_OSX_CARBON" = 1 -o "x$OSX_VERSION" = "x10.4"; then
# otherwise configure stops on leopard for universal_binary case "$OSX_VERSION" in
wxUSE_MACOSX_VERSION_MIN=10.4 10.4* )
else wxUSE_MACOSX_VERSION_MIN=10.4
# for OS X Cocoa, use 10.5 so we can get 64-bit compile on Snow Leopard ;;
wxUSE_MACOSX_VERSION_MIN=10.5
fi * )
if test "$wxUSE_OSX_CARBON" = 1; then
# otherwise configure stops on leopard for universal_binary
wxUSE_MACOSX_VERSION_MIN=10.4
else
# for Cocoa, use 10.5 to be able to compile it in 64 bits too
wxUSE_MACOSX_VERSION_MIN=10.5
fi
;;
esac
fi fi
NEEDS_GCC40="no" NEEDS_GCC40="no"