summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-28 21:30:13 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-28 21:30:13 (GMT)
commit3ddcfe976b2d00fb28ad55af607078ac9f008ca5 (patch)
tree3d10ba7765344575dde5a4b7b37f837a82946c1b
parente00863d655ddd3e79745983995885cc563d3771a (diff)
parent374cbfedc276dc200fd23f713711ffc43115e13a (diff)
downloadtcl-3ddcfe976b2d00fb28ad55af607078ac9f008ca5.zip
tcl-3ddcfe976b2d00fb28ad55af607078ac9f008ca5.tar.gz
tcl-3ddcfe976b2d00fb28ad55af607078ac9f008ca5.tar.bz2
only expect tcldde.dll when --enable-shared
-rwxr-xr-xunix/configure6
-rw-r--r--unix/configure.in4
-rw-r--r--unix/tcl.m42
3 files changed, 8 insertions, 4 deletions
diff --git a/unix/configure b/unix/configure
index da725a7..2e36ad2 100755
--- a/unix/configure
+++ b/unix/configure
@@ -7135,7 +7135,7 @@ echo "$as_me: error: ${CC} is not a cygwin compiler." >&2;}
echo "$as_me: error: CYGWIN compile is only supported with --enable-threads" >&2;}
{ (exit 1); exit 1; }; }
fi
- if test ! -f "../win/tcldde14.dll" -a ! -f "../win/tk86.dll"; then
+ if test "x${SHARED_BUILD}" = "x1" -a ! -f "../win/tcldde14.dll" -a ! -f "../win/tk86.dll"; then
{ { echo "$as_me:$LINENO: error: Please configure and make the ../win directory first." >&5
echo "$as_me: error: Please configure and make the ../win directory first." >&2;}
{ (exit 1); exit 1; }; }
@@ -14400,7 +14400,9 @@ _ACEOF
#--------------------------------------------------------------------
if test "$ac_cv_cygwin" = "yes"; then
- TCL_SHLIB_LD_EXTRAS="${TCL_SHLIB_LD_EXTRAS} \${COMPAT_DIR}/zlib/win32/zdll.lib"
+ if test "x${SHARED_BUILD}" = "x1"; then
+ TCL_SHLIB_LD_EXTRAS="${TCL_SHLIB_LD_EXTRAS} \${COMPAT_DIR}/zlib/win32/zdll.lib"
+ fi
else
echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5
echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6
diff --git a/unix/configure.in b/unix/configure.in
index 440988b..79a546d 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -303,7 +303,9 @@ SC_TIME_HANDLER
#--------------------------------------------------------------------
if test "$ac_cv_cygwin" = "yes"; then
- TCL_SHLIB_LD_EXTRAS="${TCL_SHLIB_LD_EXTRAS} \${COMPAT_DIR}/zlib/win32/zdll.lib"
+ if test "x${SHARED_BUILD}" = "x1"; then
+ TCL_SHLIB_LD_EXTRAS="${TCL_SHLIB_LD_EXTRAS} \${COMPAT_DIR}/zlib/win32/zdll.lib"
+ fi
else
AC_CHECK_MEMBERS([struct stat.st_blocks, struct stat.st_blksize])
fi
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 44475c2..a142baf 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1246,7 +1246,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
if test "x${TCL_THREADS}" = "x0"; then
AC_MSG_ERROR([CYGWIN compile is only supported with --enable-threads])
fi
- if test ! -f "../win/tcldde14.dll" -a ! -f "../win/tk86.dll"; then
+ if test "x${SHARED_BUILD}" = "x1" -a ! -f "../win/tcldde14.dll" -a ! -f "../win/tk86.dll"; then
AC_MSG_ERROR([Please configure and make the ../win directory first.])
fi
;;