Update to tk 8.5.19
This commit is contained in:
16
unix/configure.in
Normal file → Executable file
16
unix/configure.in
Normal file → Executable file
@@ -25,7 +25,7 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [
|
||||
TK_VERSION=8.5
|
||||
TK_MAJOR_VERSION=8
|
||||
TK_MINOR_VERSION=5
|
||||
TK_PATCH_LEVEL=".15"
|
||||
TK_PATCH_LEVEL=".19"
|
||||
VERSION=${TK_VERSION}
|
||||
LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
|
||||
|
||||
@@ -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?])
|
||||
@@ -509,6 +509,18 @@ if test $tk_aqua = no; then
|
||||
CFLAGS=$tk_oldCFlags
|
||||
LIBS=$tk_oldLibs
|
||||
fi
|
||||
dnl make sure that linking against fontconfig libraries finds Fc* symbols
|
||||
if test "$found_xft" = "yes" ; then
|
||||
tk_oldCFlags=$CFLAGS
|
||||
CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS"
|
||||
tk_oldLibs=$LIBS
|
||||
LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW -lfontconfig"
|
||||
AC_CHECK_LIB(fontconfig, FcFontSort, [
|
||||
XFT_LIBS="$XFT_LIBS -lfontconfig"
|
||||
], [])
|
||||
CFLAGS=$tk_oldCFlags
|
||||
LIBS=$tk_oldLibs
|
||||
fi
|
||||
dnl print a warning if xft is unusable and was specifically requested
|
||||
if test "$found_xft" = "no" ; then
|
||||
if test "$enable_xft" = "yes" ; then
|
||||
|
||||
Reference in New Issue
Block a user