From c29283f95f49336a8b8601f37270dfa6bf0fab8d Mon Sep 17 00:00:00 2001
From: Kevin Walzer <kw@codebykevin.com>
Date: Sun, 16 Mar 2014 21:19:07 +0000
Subject: Update configure files on Aqua to remove garbage collection flag,
 which is no longer supported with Xcode 5.1; also add key to Wish Info.plist
 to support high-resolution (Retina) displays.

---
 macosx/Wish-Info.plist.in | 2 ++
 unix/configure            | 2 +-
 unix/configure.in         | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/macosx/Wish-Info.plist.in b/macosx/Wish-Info.plist.in
index 90e00a4..78170f1 100644
--- a/macosx/Wish-Info.plist.in
+++ b/macosx/Wish-Info.plist.in
@@ -72,5 +72,7 @@ Copyright © 2001-2002 Jim Ingham &amp; Ian Reid</string>
 	<true/>
 	<key>OSAScriptingDefinition</key>
 	<string>Wish.sdef</string>
+	<key>NSHighResolutionCapable</key>
+	<string>True</string>
 </dict>
 </plist>
diff --git a/unix/configure b/unix/configure
index 52d2e86..e7ff831 100755
--- a/unix/configure
+++ b/unix/configure
@@ -9892,7 +9892,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
     LIBS="$LIBS -framework Cocoa -framework Carbon -framework IOKit"
-    EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c -fobjc-gc'
+    EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c'
     TK_WINDOWINGSYSTEM=AQUA
     if test -n "${enable_symbols}" -a "${enable_symbols}" != no; then
 
diff --git a/unix/configure.in b/unix/configure.in
index d9862ef..49a644c 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -365,7 +365,7 @@ fi
 if test $tk_aqua = yes; then
     AC_DEFINE(MAC_OSX_TK, 1, [Are we building TkAqua?])
     LIBS="$LIBS -framework Cocoa -framework Carbon -framework IOKit"
-    EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c -fobjc-gc'
+    EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c'
     TK_WINDOWINGSYSTEM=AQUA
     if test -n "${enable_symbols}" -a "${enable_symbols}" != no; then
         AC_DEFINE(TK_MAC_DEBUG, 1, [Are TkAqua debug messages enabled?])
-- 
cgit v0.12