diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-25 13:53:20 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-25 13:53:20 (GMT) |
| commit | fa31023365ece2d5c33d226c77b1aaa061cc10fa (patch) | |
| tree | 146be4229d49816cbca05fb8b07b11e158b3ea10 /unix | |
| parent | 25b3e364d0e21bb057ddb735dc65fcbcaf6f070e (diff) | |
| parent | a2eecbce351c9dc1436c1a7a1582e1df477e7d8d (diff) | |
| download | tk-fa31023365ece2d5c33d226c77b1aaa061cc10fa.zip tk-fa31023365ece2d5c33d226c77b1aaa061cc10fa.tar.gz tk-fa31023365ece2d5c33d226c77b1aaa061cc10fa.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 10 | ||||
| -rw-r--r-- | unix/configure.ac | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/unix/configure b/unix/configure index 51cc17e..208483b 100755 --- a/unix/configure +++ b/unix/configure @@ -8696,14 +8696,18 @@ else fi # libdir must be a fully qualified path and not ${exec_prefix}/lib eval libdir="$libdir" + TK_LIB_FLAG="-l" + if test "${TCL_MAJOR_VERSION}" -gt 8 ; then + TK_LIB_FLAG="${TK_LIB_FLAG}tcl9" + fi if test "${ac_cv_cygwin}" = "yes" -a "$SHARED_BUILD" = "1"; then - TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`" + TK_LIB_FLAG="${TK_LIB_FLAG}tk`echo ${TK_VERSION} | tr -d .`" TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}" else if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then - TK_LIB_FLAG="-ltk${TK_VERSION}" + TK_LIB_FLAG="${TK_LIB_FLAG}tk${TK_VERSION}" else - TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`" + TK_LIB_FLAG="${TK_LIB_FLAG}tk`echo ${TK_VERSION} | tr -d .`" fi TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}" fi diff --git a/unix/configure.ac b/unix/configure.ac index 4f74644..b728ce1 100644 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -652,14 +652,18 @@ else fi # libdir must be a fully qualified path and not ${exec_prefix}/lib eval libdir="$libdir" + TK_LIB_FLAG="-l" + if test "${TCL_MAJOR_VERSION}" -gt 8 ; then + TK_LIB_FLAG="${TK_LIB_FLAG}tcl9" + fi if test "${ac_cv_cygwin}" = "yes" -a "$SHARED_BUILD" = "1"; then - TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`" + TK_LIB_FLAG="${TK_LIB_FLAG}tk`echo ${TK_VERSION} | tr -d .`" TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}" else if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then - TK_LIB_FLAG="-ltk${TK_VERSION}" + TK_LIB_FLAG="${TK_LIB_FLAG}tk${TK_VERSION}" else - TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`" + TK_LIB_FLAG="${TK_LIB_FLAG}tk`echo ${TK_VERSION} | tr -d .`" fi TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}" fi |