diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-07-01 19:51:28 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-07-01 19:51:28 (GMT) |
| commit | 7747ac024f699006066d1eb7919fab3f7715d835 (patch) | |
| tree | 14e48d160d21d4a4b84a7a47545b914f6f1962c0 /unix/configure.in | |
| parent | 24ce75e998f13506548f2bebeb361405aa16546f (diff) | |
| parent | a01324b87773322006055cac9ff0da9bdae34d4b (diff) | |
| download | tcl-7747ac024f699006066d1eb7919fab3f7715d835.zip tcl-7747ac024f699006066d1eb7919fab3f7715d835.tar.gz tcl-7747ac024f699006066d1eb7919fab3f7715d835.tar.bz2 | |
merge trunk
Diffstat (limited to 'unix/configure.in')
| -rw-r--r-- | unix/configure.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/unix/configure.in b/unix/configure.in index 726d4a8..79a546d 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,12 @@ 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 + 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 AC_CHECK_TYPES([blkcnt_t]) AC_CHECK_FUNC(fstatfs, , [AC_DEFINE(NO_FSTATFS, 1, [Do we have fstatfs()?])]) |