diff options
| author | mdejong <mdejong> | 2002-01-11 18:41:04 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2002-01-11 18:41:04 (GMT) |
| commit | b8647f8610823cb641bb2cf79a22ecd15ddc39cd (patch) | |
| tree | 0b5c563ac401e39d2cee8a52b67e833641e59143 /unix/configure | |
| parent | 25763c453c7b11724ebbae222c63fec2071873f4 (diff) | |
| download | tk-b8647f8610823cb641bb2cf79a22ecd15ddc39cd.zip tk-b8647f8610823cb641bb2cf79a22ecd15ddc39cd.tar.gz tk-b8647f8610823cb641bb2cf79a22ecd15ddc39cd.tar.bz2 | |
Enable use of Tcl stubs when building Tk as
a shared library. This should fix the build
under AIX. [Bugs 220858, 220955, 220921]
* unix/Makefile.in: Add TCL_STUB_LIB_SPEC and
TCL_STUB_LIB_FLAG variables.
* unix/configure: Regen.
* unix/configure.in: Pass TCL_STUB_LIB_SPEC into
Makefile and use it when linking the tk shared library.
Define USE_TCL_STUBS when building shared. Subst
TCL_STUB_LIB_SPEC and TCL_STUB_LIB_FLAG.
Diffstat (limited to 'unix/configure')
| -rwxr-xr-x | unix/configure | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/unix/configure b/unix/configure index bdc3c35..7d2712f 100755 --- a/unix/configure +++ b/unix/configure @@ -4397,11 +4397,10 @@ TCL_STUB_LIB_SPEC='-L$(TCL_BIN_DIR) $(TCL_STUB_LIB_FLAG)' if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}" TK_LIB_FILE=libtk${TK_SHARED_LIB_SUFFIX} - MAKE_LIB="\${SHLIB_LD} -o \$@ \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS}" + MAKE_LIB="\${SHLIB_LD} -o \$@ \${OBJS} \$(TK_LD_SEARCH_FLAGS) \${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS}" RANLIB=":" -# TCL_STUB_FLAGS="-DUSE_TCL_STUBS" - TCL_STUB_FLAGS="" + TCL_STUB_FLAGS="-DUSE_TCL_STUBS" else TK_SHLIB_CFLAGS="" TK_LIB_FILE=libtk${TK_UNSHARED_LIB_SUFFIX} @@ -4512,6 +4511,8 @@ eval "TK_LIB_FILE=${TK_LIB_FILE}" + + #AC_SUBST(TCL_BUILD_STUB_LIB_SPEC) #AC_SUBST(TCL_BUILD_LIB_SPEC) @@ -4717,7 +4718,9 @@ s%@SHLIB_LD_LIBS@%$SHLIB_LD_LIBS%g s%@SHLIB_SUFFIX@%$SHLIB_SUFFIX%g s%@SHLIB_VERSION@%$SHLIB_VERSION%g s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g +s%@TCL_STUB_LIB_SPEC@%$TCL_STUB_LIB_SPEC%g s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g +s%@TCL_STUB_LIB_FLAG@%$TCL_STUB_LIB_FLAG%g s%@TCL_DBGX@%$TCL_DBGX%g s%@TCL_VERSION@%$TCL_VERSION%g s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g |