diff options
| author | Dan Gudmundsson <[email protected]> | 2013-01-15 09:18:49 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-01-15 09:18:49 +0100 |
| commit | 0e044f3525d22de4c4c471f601de50ad3acda304 (patch) | |
| tree | dfbbcc31814b0890fcb7774a48cf43322b29ac94 /erts | |
| parent | fdd0b38e2c85d897a240e5f8f79e268c6540dbfd (diff) | |
| parent | c384a91846f7d0aff189fb51d1d502330d7abef4 (diff) | |
| download | otp-0e044f3525d22de4c4c471f601de50ad3acda304.tar.gz otp-0e044f3525d22de4c4c471f601de50ad3acda304.tar.bz2 otp-0e044f3525d22de4c4c471f601de50ad3acda304.zip | |
Merge branch 'dgud/wx/fix-wx-2.9-compat/OTP-10407'
* dgud/wx/fix-wx-2.9-compat/OTP-10407: (26 commits)
wx: Fix comments
wx: Workaround wx-2.9 bugs
wx: Mac fixes
wx: Fix demo and tests
wx: Allow 64 bits compilation on mac, requires wxWidgets-2.9
appmon: Move runtime part to runtime_tools app
reltool: fix wxWidgets-2.9 compability
debugger: Fix 2.9 compat
observer: Fix check for graphics contexts
Observer: Fix distribution dialog
observer: Fix font sizes
wx: Fix the demo
wx: Fix loading icons and cursors in Windows
wx: Remove unnecessary casts
wx: Fix changed getfunctions
wx: Depricate wxCursor new functions
wx: Fix int to enum
wx: Include correct m4 file in 2.9
wx: Update examples so they work with both wxWidgets 2.8 and 2.9
wx: Modify tests so they work on wxWidgets-2.9
...
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/configure.in | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/erts/configure.in b/erts/configure.in index 3dfd3fc7b7..30bc1ef000 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -740,12 +740,8 @@ esac AC_MSG_CHECKING(if VM has to be linked with Carbon framework) case $ARCH-$OPSYS in - amd64-darwin*) - LIBCARBON= - AC_MSG_RESULT([no]) - ;; *-darwin*) - LIBCARBON="-framework Carbon " + LIBCARBON="-framework Carbon -framework Cocoa" AC_MSG_RESULT([yes]) ;; *) |