diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-04-06 15:47:17 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-04-06 15:47:17 (GMT) |
| commit | 774a6e14bbec230d6a4e08e529a4f72c0405ad5e (patch) | |
| tree | 5dba26443e8ad285bda9fb438eb5c90963b00715 /unix/configure | |
| parent | dd327eebecfff30c0d601f700f98ee3a3f0edd73 (diff) | |
| download | tk-774a6e14bbec230d6a4e08e529a4f72c0405ad5e.zip tk-774a6e14bbec230d6a4e08e529a4f72c0405ad5e.tar.gz tk-774a6e14bbec230d6a4e08e529a4f72c0405ad5e.tar.bz2 | |
Make pkgIndex.tcl files work on all platforms
Diffstat (limited to 'unix/configure')
| -rwxr-xr-x | unix/configure | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/unix/configure b/unix/configure index 208483b..579bd0d 100755 --- a/unix/configure +++ b/unix/configure @@ -681,6 +681,8 @@ TK_STUB_LIB_FLAG TK_STUB_LIB_FILE TK_LIB_SPEC TK_LIB_FLAG +TK_LIB_FILE_TCL9 +TK_LIB_FILE_TCL8 TK_LIB_FILE TK_YEAR TK_PATCH_LEVEL @@ -8559,11 +8561,13 @@ fi eval eval "TK_UNSHARED_LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}" eval eval "TK_SHARED_LIB_SUFFIX=${SHARED_LIB_SUFFIX}" +eval "TK_LIB_FILE_TCL8=libtk${LIB_SUFFIX}" if test ${TCL_MAJOR_VERSION} = 8 ; then eval "TK_LIB_FILE=libtk${LIB_SUFFIX}" else eval "TK_LIB_FILE=libtcl9tk${LIB_SUFFIX}" fi +eval "TK_LIB_FILE_TCL9=libtcl9tk${LIB_SUFFIX}" # tkConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed # since on some platforms TK_LIB_FILE contains shell escapes. @@ -8657,7 +8661,13 @@ printf "%s\n" "#define TK_FRAMEWORK 1" >>confdefs.h # override libdir default libdir="/Library/Frameworks" fi - TK_LIB_FILE="Tk" + if test ${TCL_MAJOR_VERSION} = 8 ; then + TK_LIB_FILE="Tk" + else + TK_LIB_FILE="Tk" + fi + TK_LIB_FILE_TCL8="Tk" + TK_LIB_FILE_TCL9="Tk" TK_LIB_FLAG="-framework Tk" TK_BUILD_LIB_SPEC="-F`pwd | sed -e 's/ /\\\\ /g'` -framework Tk" TK_LIB_SPEC="-F${libdir} -framework Tk" @@ -9007,6 +9017,8 @@ TK_SHARED_BUILD=${SHARED_BUILD} + + ac_config_files="$ac_config_files Makefile:../unix/Makefile.in tkConfig.sh:../unix/tkConfig.sh.in tk.pc:../unix/tk.pc.in" cat >confcache <<\_ACEOF |