diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-26 09:41:38 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-26 09:41:38 (GMT) |
| commit | f38639f6e7af8f724c5401f5c47cdbfb25da03a4 (patch) | |
| tree | f512b57fedb8316a25dd547d05d6f0eb19c5bc94 /unix/configure.in | |
| parent | bf0457f646f2d6667b2a7bc12204a152d54e25b3 (diff) | |
| download | tcl-f38639f6e7af8f724c5401f5c47cdbfb25da03a4.zip tcl-f38639f6e7af8f724c5401f5c47cdbfb25da03a4.tar.gz tcl-f38639f6e7af8f724c5401f5c47cdbfb25da03a4.tar.bz2 | |
Let Cygwin shared build link with zlib1.dll, not cygz.dll (two less dependencies on cygwin-specific dll's)
Diffstat (limited to 'unix/configure.in')
| -rw-r--r-- | unix/configure.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/unix/configure.in b/unix/configure.in index 726d4a8..440988b 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -160,7 +160,6 @@ AS_IF([test $zlib_ok = yes], [ zlib_ok=no ])]) AS_IF([test $zlib_ok = no], [ - AC_SUBST(ZLIB_DIR,[\${COMPAT_DIR}/zlib]) AC_SUBST(ZLIB_OBJS,[\${ZLIB_OBJS}]) AC_SUBST(ZLIB_SRCS,[\${ZLIB_SRCS}]) AC_SUBST(ZLIB_INCLUDE,[-I\${ZLIB_DIR}]) @@ -303,8 +302,10 @@ SC_TIME_HANDLER # lack blkcnt_t. #-------------------------------------------------------------------- -if test "$ac_cv_cygwin" != "yes"; then -AC_CHECK_MEMBERS([struct stat.st_blocks, struct stat.st_blksize]) +if test "$ac_cv_cygwin" = "yes"; then + TCL_SHLIB_LD_EXTRAS="${TCL_SHLIB_LD_EXTRAS} \${COMPAT_DIR}/zlib/win32/zdll.lib" +else + AC_CHECK_MEMBERS([struct stat.st_blocks, struct stat.st_blksize]) fi AC_CHECK_TYPES([blkcnt_t]) AC_CHECK_FUNC(fstatfs, , [AC_DEFINE(NO_FSTATFS, 1, [Do we have fstatfs()?])]) |