diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rwxr-xr-x | win/configure | 6 | ||||
| -rw-r--r-- | win/configure.in | 4 | ||||
| -rw-r--r-- | win/tcl.m4 | 4 |
4 files changed, 19 insertions, 3 deletions
@@ -1,6 +1,14 @@ 2003-04-02 Mo DeJong <mdejong@users.sourceforge.net> * win/configure: Regen. + * win/configure.in: Set stub lib flag based + on new LIBFLAGSUFFIX variable. + * win/tcl.m4: Update from Tcl to get new + LIBFLAGSUFFIX variable. + +2003-04-02 Mo DeJong <mdejong@users.sourceforge.net> + + * win/configure: Regen. * win/configure.in: Don't set TCL_DLL_FILE, TCL_LIB_FILE, TCL_STUB_LIB_FILE, TCL_STUB_LIB_FLAG, and TCL_BUILD_STUB_LIB_SPEC. These variables are diff --git a/win/configure b/win/configure index d8939fb..768fde5 100755 --- a/win/configure +++ b/win/configure @@ -2639,6 +2639,7 @@ echo "${ECHO_T}using static flags" >&6 runtime= MAKE_DLL="echo " LIBSUFFIX="s\${DBGX}.a" + LIBFLAGSUFFIX="s\${DBGX}" LIBRARIES="\${STATIC_LIBRARIES}" EXESUFFIX="s\${DBGX}.exe" else @@ -2666,6 +2667,7 @@ echo "$as_me: error: ${CC} does not support the -shared option. -Wl,--out-implib,\$(patsubst %.dll,lib%.a,\$@)" LIBSUFFIX="\${DBGX}.a" + LIBFLAGSUFFIX="\${DBGX}" EXESUFFIX="\${DBGX}.exe" LIBRARIES="\${SHARED_LIBRARIES}" fi @@ -2710,6 +2712,7 @@ echo "${ECHO_T}using static flags" >&6 runtime=-MT MAKE_DLL="echo " LIBSUFFIX="s\${DBGX}.lib" + LIBFLAGSUFFIX="s\${DBGX}" LIBRARIES="\${STATIC_LIBRARIES}" EXESUFFIX="s\${DBGX}.exe" SHLIB_LD_LIBS="" @@ -2721,6 +2724,7 @@ echo "${ECHO_T}using shared flags" >&6 # Add SHLIB_LD_LIBS to the Make rule, not here. MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -out:\$@" LIBSUFFIX="\${DBGX}.lib" + LIBFLAGSUFFIX="\${DBGX}" EXESUFFIX="\${DBGX}.exe" LIBRARIES="\${SHARED_LIBRARIES}" SHLIB_LD_LIBS='${LIBS}' @@ -3641,7 +3645,7 @@ eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${VER}${LIBSUFFIX}" # I left out the other vars that also need to get defined here. # we also need to double check about including DBGX in lib names # and spaces in file or directory names for the eval -eval "TK_STUB_LIB_FLAG=\"-ltkstub${VER}${TCL_DBGX}\"" +eval "TK_STUB_LIB_FLAG=\"-ltkstub${VER}${LIBFLAGSUFFIX}\"" eval "TK_BUILD_STUB_LIB_SPEC=\"-L`pwd` ${TK_STUB_LIB_FLAG}\"" eval "DLLSUFFIX=${DLLSUFFIX}" diff --git a/win/configure.in b/win/configure.in index 8d50b8d..85fc7c9 100644 --- a/win/configure.in +++ b/win/configure.in @@ -3,7 +3,7 @@ # generate the file "configure", which is run during Tk installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.53 2003/04/03 02:01:07 mdejong Exp $ +# RCS: @(#) $Id: configure.in,v 1.54 2003/04/03 02:31:31 mdejong Exp $ AC_INIT(../generic/tk.h) AC_PREREQ(2.57) @@ -175,7 +175,7 @@ eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${VER}${LIBSUFFIX}" # I left out the other vars that also need to get defined here. # we also need to double check about including DBGX in lib names # and spaces in file or directory names for the eval -eval "TK_STUB_LIB_FLAG=\"-ltkstub${VER}${TCL_DBGX}\"" +eval "TK_STUB_LIB_FLAG=\"-ltkstub${VER}${LIBFLAGSUFFIX}\"" eval "TK_BUILD_STUB_LIB_SPEC=\"-L`pwd` ${TK_STUB_LIB_FLAG}\"" eval "DLLSUFFIX=${DLLSUFFIX}" @@ -477,6 +477,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ runtime= MAKE_DLL="echo " LIBSUFFIX="s\${DBGX}.a" + LIBFLAGSUFFIX="s\${DBGX}" LIBRARIES="\${STATIC_LIBRARIES}" EXESUFFIX="s\${DBGX}.exe" else @@ -500,6 +501,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ -Wl,--out-implib,\$(patsubst %.dll,lib%.a,\[$]@)" LIBSUFFIX="\${DBGX}.a" + LIBFLAGSUFFIX="\${DBGX}" EXESUFFIX="\${DBGX}.exe" LIBRARIES="\${SHARED_LIBRARIES}" fi @@ -543,6 +545,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ runtime=-MT MAKE_DLL="echo " LIBSUFFIX="s\${DBGX}.lib" + LIBFLAGSUFFIX="s\${DBGX}" LIBRARIES="\${STATIC_LIBRARIES}" EXESUFFIX="s\${DBGX}.exe" SHLIB_LD_LIBS="" @@ -553,6 +556,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ # Add SHLIB_LD_LIBS to the Make rule, not here. MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -out:\[$]@" LIBSUFFIX="\${DBGX}.lib" + LIBFLAGSUFFIX="\${DBGX}" EXESUFFIX="\${DBGX}.exe" LIBRARIES="\${SHARED_LIBRARIES}" SHLIB_LD_LIBS='${LIBS}' |