diff options
| author | mdejong <mdejong> | 2003-04-03 10:11:55 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2003-04-03 10:11:55 (GMT) |
| commit | d83a9a1baf2b53553d2cc392eda9e5a5d0b44a12 (patch) | |
| tree | 482c1aba21636ba65913ce1c0149f1657ef820bd /win/tcl.m4 | |
| parent | 8e95bf1faee00a740455e979fa25c531a65d80f4 (diff) | |
| download | tk-d83a9a1baf2b53553d2cc392eda9e5a5d0b44a12.zip tk-d83a9a1baf2b53553d2cc392eda9e5a5d0b44a12.tar.gz tk-d83a9a1baf2b53553d2cc392eda9e5a5d0b44a12.tar.bz2 | |
* 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.
Diffstat (limited to 'win/tcl.m4')
| -rw-r--r-- | win/tcl.m4 | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -390,6 +390,8 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ AC_CHECK_PROG(CYGPATH, cygpath, cygpath -w, echo) + SHLIB_SUFFIX=".dll" + # Check for a bug in gcc's windres that causes the # compile to fail when a Windows native path is # passed into windres. The mingw toolchain requires @@ -475,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 @@ -492,17 +495,20 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ # -luser32 and -lmsvcrt by default. Make sure CFLAGS is # included so -mno-cygwin passed the correct libs to the linker. SHLIB_LD='${CC} -shared ${CFLAGS}' + SHLIB_LD_LIBS='${LIBS}' # Add SHLIB_LD_LIBS to the Make rule, not here. MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -o \[$]@ ${extra_ldflags} \ -Wl,--out-implib,\$(patsubst %.dll,lib%.a,\[$]@)" LIBSUFFIX="\${DBGX}.a" + LIBFLAGSUFFIX="\${DBGX}" 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" + SHLIB_SUFFIX=.dll EXTRA_CFLAGS="${extra_cflags}" @@ -539,8 +545,10 @@ 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="" else # dynamic AC_MSG_RESULT([using shared flags]) @@ -548,8 +556,10 @@ 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}' fi # DLLSUFFIX is separate because it is the building block for # users of tclConfig.sh that may build shared or static. @@ -593,7 +603,6 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ fi SHLIB_LD="${LINKBIN} -dll -nologo -incremental:no" - SHLIB_LD_LIBS="user32.lib advapi32.lib" LIBS="user32.lib advapi32.lib" LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib" RC_OUT=-fo |