summaryrefslogtreecommitdiffstats
path: root/win/tcl.m4
diff options
context:
space:
mode:
authormdejong <mdejong>2003-03-13 10:54:48 (GMT)
committermdejong <mdejong>2003-03-13 10:54:48 (GMT)
commit717e752cab9ac13ccf3bfde94dd5dd4465b4f474 (patch)
tree65e42be439ad084ab0a076c284217137c5cc6541 /win/tcl.m4
parent7d023718139986d6a52228299d1c68a78b09dab4 (diff)
downloadtk-717e752cab9ac13ccf3bfde94dd5dd4465b4f474.zip
tk-717e752cab9ac13ccf3bfde94dd5dd4465b4f474.tar.gz
tk-717e752cab9ac13ccf3bfde94dd5dd4465b4f474.tar.bz2
Require autoconf 2.57 or newer, see TIP 34
for a detailed explanation of why this is good. This will no doubt break the build on some platforms, let the flaming begin. * unix/configure: Regen with autoconf 2.57. * unix/configure.in: Require autoconf 2.57. * unix/tcl.m4: Update from Tcl. * win/configure: Regen with autoconf 2.57. * win/configure.in: Require autoconf 2.57. * win/tcl.m4: Update from Tcl.
Diffstat (limited to 'win/tcl.m4')
-rw-r--r--win/tcl.m47
1 files changed, 6 insertions, 1 deletions
diff --git a/win/tcl.m4 b/win/tcl.m4
index 48c4ba3..3bc07ef 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -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
@@ -492,6 +494,7 @@ 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,\[$]@)"
@@ -503,6 +506,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
# 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}"
@@ -541,6 +545,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
LIBSUFFIX="s\${DBGX}.lib"
LIBRARIES="\${STATIC_LIBRARIES}"
EXESUFFIX="s\${DBGX}.exe"
+ SHLIB_LD_LIBS=""
else
# dynamic
AC_MSG_RESULT([using shared flags])
@@ -550,6 +555,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
LIBSUFFIX="\${DBGX}.lib"
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 +599,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