diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-31 00:29:47 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-31 00:29:47 (GMT) |
| commit | efde7ee3dba6e04f5c9297a58f63cfdd0b65ee1e (patch) | |
| tree | a397aecd86c7394b470c36c673ebf4e12c80376a | |
| parent | 0421749037c4e70600cfdd94692aed05db839e4a (diff) | |
| download | tk-efde7ee3dba6e04f5c9297a58f63cfdd0b65ee1e.zip tk-efde7ee3dba6e04f5c9297a58f63cfdd0b65ee1e.tar.gz tk-efde7ee3dba6e04f5c9297a58f63cfdd0b65ee1e.tar.bz2 | |
Attempt to fix [85f316beb1]: Tk 8.6.11 RC1 fails to produce static Wish with Aqua support
| -rwxr-xr-x | unix/configure | 3 | ||||
| -rw-r--r-- | unix/configure.in | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/unix/configure b/unix/configure index c00678d..b1f6e4c 100755 --- a/unix/configure +++ b/unix/configure @@ -10974,6 +10974,9 @@ echo "${ECHO_T}static library" >&6 TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -sectcreate __TEXT __info_plist Tk-Info.plist' EXTRA_WISH_LIBS='-sectcreate __TEXT __info_plist Wish-Info.plist' EXTRA_WISH_LIBS=${EXTRA_WISH_LIBS}' -sectcreate __TEXT __credits_html Credits.html' + if test "${SHARED_BUILD}" = "0"; then + EXTRA_WISH_LIBS=${EXTRA_WISH_LIBS}' -ObjC' + fi EXTRA_APP_CC_SWITCHES="${EXTRA_APP_CC_SWITCHES}"' -mdynamic-no-pic' ac_config_files="$ac_config_files Tk-Info.plist:../macosx/Tk-Info.plist.in Wish-Info.plist:../macosx/Wish-Info.plist.in Credits.html:../macosx/Credits.html.in" diff --git a/unix/configure.in b/unix/configure.in index a313d32..9eadae3 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -683,6 +683,9 @@ if test "`uname -s`" = "Darwin" ; then TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -sectcreate __TEXT __info_plist Tk-Info.plist' EXTRA_WISH_LIBS='-sectcreate __TEXT __info_plist Wish-Info.plist' EXTRA_WISH_LIBS=${EXTRA_WISH_LIBS}' -sectcreate __TEXT __credits_html Credits.html' + if test "${SHARED_BUILD}" = "0"; then + EXTRA_WISH_LIBS=${EXTRA_WISH_LIBS}' -ObjC' + fi EXTRA_APP_CC_SWITCHES="${EXTRA_APP_CC_SWITCHES}"' -mdynamic-no-pic' AC_CONFIG_FILES([Tk-Info.plist:../macosx/Tk-Info.plist.in Wish-Info.plist:../macosx/Wish-Info.plist.in Credits.html:../macosx/Credits.html.in]) for l in ${LOCALES}; do CFBUNDLELOCALIZATIONS="${CFBUNDLELOCALIZATIONS}<string>$l</string>"; done |