diff options
| author | hobbs <hobbs> | 2001-08-04 00:29:56 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2001-08-04 00:29:56 (GMT) |
| commit | 30e0d397055894b4fa0053664ff28617a243dca3 (patch) | |
| tree | 3387369f256aa7d567422b42156ccee929799f0a /win/tcl.m4 | |
| parent | d2c446fa70d95edabe7abc4ab43777c8151fb30b (diff) | |
| download | tk-30e0d397055894b4fa0053664ff28617a243dca3.zip tk-30e0d397055894b4fa0053664ff28617a243dca3.tar.gz tk-30e0d397055894b4fa0053664ff28617a243dca3.tar.bz2 | |
* win/configure: regenerated
* win/tcl.m4: fixed DLLSUFFIX definition to always be ${DBGX}.dll.
This is necessary for TEA compliant builds that build shared
against a static-built Tk.
* win/Makefile.in ($(WISH)): added $(TK_STUB_LIB_FILE) to build
target, otherwise it wouldn't get generated in a static build.
Diffstat (limited to 'win/tcl.m4')
| -rw-r--r-- | win/tcl.m4 | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -376,7 +376,6 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ LIBSUFFIX="s\${DBGX}.a" LIBRARIES="\${STATIC_LIBRARIES}" EXESUFFIX="s\${DBGX}.exe" - DLLSUFFIX="" else # dynamic AC_MSG_RESULT([using shared flags]) @@ -397,10 +396,12 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ -Wl,--out-implib,\$(patsubst %.dll,lib%.a,\[$]@)" LIBSUFFIX="\${DBGX}.a" - DLLSUFFIX="\${DBGX}.dll" EXESUFFIX="\${DBGX}.exe" LIBRARIES="\${SHARED_LIBRARIES}" fi + # DLLSUFFIX is separate because it is the building block for + # users of tclConfig.sh that may build shared or static. + DLLSUFFIX="\${DBGX}.dll" EXTRA_CFLAGS="${extra_cflags}" @@ -450,7 +451,6 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ LIBSUFFIX="s\${DBGX}.lib" LIBRARIES="\${STATIC_LIBRARIES}" EXESUFFIX="s\${DBGX}.exe" - DLLSUFFIX="" else # dynamic AC_MSG_RESULT([using shared flags]) @@ -458,10 +458,12 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ # Add SHLIB_LD_LIBS to the Make rule, not here. MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -out:\[$]@" LIBSUFFIX="\${DBGX}.lib" - DLLSUFFIX="\${DBGX}.dll" EXESUFFIX="\${DBGX}.exe" LIBRARIES="\${SHARED_LIBRARIES}" fi + # DLLSUFFIX is separate because it is the building block for + # users of tclConfig.sh that may build shared or static. + DLLSUFFIX="\${DBGX}.dll" EXTRA_CFLAGS="-YX" CFLAGS_DEBUG="-nologo -Z7 -Od -WX ${runtime}d" |