diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | unix/Makefile.in | 5 | ||||
| -rwxr-xr-x | unix/configure | 9 | ||||
| -rw-r--r-- | unix/configure.in | 9 |
4 files changed, 29 insertions, 8 deletions
@@ -1,3 +1,17 @@ +2002-01-11 Mo DeJong <mdejong@users.sourceforge.net> + + 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. + 2002-01-08 D. Richard Hipp <drh@hwaci.com> * win/tkWinMenu.c: Fix the following bug: If you select an entry diff --git a/unix/Makefile.in b/unix/Makefile.in index 17d3198..1080cff 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.59 2001/12/19 07:45:52 mdejong Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.60 2002/01/11 18:41:04 mdejong Exp $ # Current Tk version; used in various names. @@ -195,6 +195,9 @@ TK_LIB_FLAG = @TK_LIB_FLAG@ #TCL_LIB_SPEC = @TCL_BUILD_LIB_SPEC@ TCL_LIB_SPEC = @TCL_LIB_SPEC@ +#TCL_STUB_LIB_SPEC = @TCL_BUILD_STUB_LIB_SPEC@ +TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@ +TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@ TK_EXP_FILE = @TK_EXP_FILE@ TK_BUILD_EXP_FILE = @TK_BUILD_EXP_FILE@ 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 diff --git a/unix/configure.in b/unix/configure.in index 2be2273..5c738fa 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tk installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.65 2001/12/19 08:01:56 mdejong Exp $ +# RCS: @(#) $Id: configure.in,v 1.66 2002/01/11 18:41:05 mdejong Exp $ AC_INIT(../generic/tk.h) @@ -349,11 +349,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} @@ -463,7 +462,9 @@ AC_SUBST(SHLIB_SUFFIX) AC_SUBST(SHLIB_VERSION) AC_SUBST(TCL_BIN_DIR) AC_SUBST(TCL_LIB_SPEC) +AC_SUBST(TCL_STUB_LIB_SPEC) AC_SUBST(TCL_LIB_FLAG) +AC_SUBST(TCL_STUB_LIB_FLAG) #AC_SUBST(TCL_BUILD_STUB_LIB_SPEC) #AC_SUBST(TCL_BUILD_LIB_SPEC) AC_SUBST(TCL_DBGX) |