diff options
| author | dgp <dgp@users.sourceforge.net> | 2020-12-31 01:52:54 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2020-12-31 01:52:54 (GMT) |
| commit | 86f2568af121eef578eb52d2660aa22d8448bbf5 (patch) | |
| tree | f83ee151b24aa97859d046bdaf1e1f89450f3c61 | |
| parent | 4d09c102e58eab62ae97c905fbc69a3836a3b142 (diff) | |
| parent | f63ee0c100db67995f79f475b16987bf25c0834f (diff) | |
| download | tk-86f2568af121eef578eb52d2660aa22d8448bbf5.zip tk-86f2568af121eef578eb52d2660aa22d8448bbf5.tar.gz tk-86f2568af121eef578eb52d2660aa22d8448bbf5.tar.bz2 | |
merge 8.6core-8-6-11
| -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 f380dff..7c03225 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 680b531..7954e30 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 |