summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorKevin Walzer <kw@codebykevin.com>2023-10-18 02:21:43 (GMT)
committerKevin Walzer <kw@codebykevin.com>2023-10-18 02:21:43 (GMT)
commit2922e26deba5e35fba028fa5d14ac91f9843d845 (patch)
treebd2081c83148a5d32aeb166cd809577723459a8d /unix
parentdfecc718055ad15f2832e0c48a8a042e39136b0d (diff)
parent6bb5d7f2d1bbe5252388a2431878ddb6bfa912a9 (diff)
downloadtk-2922e26deba5e35fba028fa5d14ac91f9843d845.zip
tk-2922e26deba5e35fba028fa5d14ac91f9843d845.tar.gz
tk-2922e26deba5e35fba028fa5d14ac91f9843d845.tar.bz2
Merge mac_cg_printing branch to correct broken printing on Sonoma; thanks to Marc Culler and Steve Landers for input
Diffstat (limited to 'unix')
-rw-r--r--unix/Makefile.in2
-rwxr-xr-xunix/configure2
-rw-r--r--unix/configure.ac2
3 files changed, 3 insertions, 3 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index a9651ac..9fce557 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1402,7 +1402,7 @@ tkMacOSXFont.o: $(MAC_OSX_DIR)/tkMacOSXFont.c
tkMacOSXHLEvents.o: $(MAC_OSX_DIR)/tkMacOSXHLEvents.c
$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXHLEvents.c
-tkMacOSXImage.o: $(MAC_OSX_DIR)/tkMacOSXImage.c
+tkMacOSXImage.o: $(MAC_OSX_DIR)/tkMacOSXImage.c
$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXImage.c
tkMacOSXInit.o: $(MAC_OSX_DIR)/tkMacOSXInit.c tkConfig.sh
diff --git a/unix/configure b/unix/configure
index dd73d5c..065c0bf 100755
--- a/unix/configure
+++ b/unix/configure
@@ -7652,7 +7652,7 @@ if test $tk_aqua = yes; then
printf "%s\n" "#define MAC_OSX_TK 1" >>confdefs.h
- LIBS="$LIBS -framework Cocoa -framework Carbon -framework IOKit -framework QuartzCore -framework Security"
+ LIBS="$LIBS -framework Cocoa -framework Carbon -framework IOKit -framework QuartzCore -framework Security -framework CoreGraphics"
if test -d /System/Library/Frameworks/UserNotifications.framework; then
LIBS="$LIBS -framework UserNotifications"
fi
diff --git a/unix/configure.ac b/unix/configure.ac
index a81c527..38eda9d 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -284,7 +284,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 -framework QuartzCore -framework Security"
+ LIBS="$LIBS -framework Cocoa -framework Carbon -framework IOKit -framework QuartzCore -framework Security -framework CoreGraphics"
if test -d /System/Library/Frameworks/UserNotifications.framework; then
LIBS="$LIBS -framework UserNotifications"
fi