diff options
| author | mdejong <mdejong> | 2003-04-03 02:24:11 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2003-04-03 02:24:11 (GMT) |
| commit | 18f17ff4b787b7183764a21bc157390857b95d5f (patch) | |
| tree | 63e94423a024dd237a38554c56a2b4ccf82b0cc3 /win/configure | |
| parent | 18d98caf85ba0de87a91682af5678f6bd580a778 (diff) | |
| download | tcl-18f17ff4b787b7183764a21bc157390857b95d5f.zip tcl-18f17ff4b787b7183764a21bc157390857b95d5f.tar.gz tcl-18f17ff4b787b7183764a21bc157390857b95d5f.tar.bz2 | |
* win/configure: Regen.
* win/configure.in: Set stub lib flag based
on new LIBFLAGSUFFIX variable.
* win/tcl.m4 (SC_CONFIG_CFLAGS): Set new
LIBFLAGSUFFIX that works like LIBSUFFIX,
it is used when creating library names.
The previous implementation would generate
-ltclstub85 instead of -ltclstub85s when
configured with --disable-shared.
Diffstat (limited to 'win/configure')
| -rwxr-xr-x | win/configure | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/win/configure b/win/configure index d6f0246..031e866 100755 --- a/win/configure +++ b/win/configure @@ -3037,6 +3037,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 @@ -3064,6 +3065,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 @@ -3108,6 +3110,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="" @@ -3119,6 +3122,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}' @@ -3906,7 +3910,7 @@ eval "TCL_LIB_FILE=${LIBPREFIX}tcl$VER${LIBSUFFIX}" #TCL_LIB_SPEC eval "TCL_STUB_LIB_FILE=\"${LIBPREFIX}tclstub${VER}${LIBSUFFIX}\"" -eval "TCL_STUB_LIB_FLAG=\"-ltclstub${VER}${TCL_DBGX}\"" +eval "TCL_STUB_LIB_FLAG=\"-ltclstub${VER}${LIBFLAGSUFFIX}\"" eval "TCL_BUILD_STUB_LIB_SPEC=\"-L`pwd` ${TCL_STUB_LIB_FLAG}\"" eval "TCL_STUB_LIB_SPEC=\"-L${libdir} ${TCL_STUB_LIB_FLAG}\"" eval "TCL_BUILD_STUB_LIB_PATH=\"`pwd`/${TCL_STUB_LIB_FILE}\"" |