summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2008-12-14 13:44:47 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2008-12-14 13:44:47 (GMT)
commit52bfe7018d1a7f4cb93fc25ea27e958bb6fed544 (patch)
tree83266f84b90d2aba0b6b5b60319d9e0946624966 /unix
parent0d6964f92c0fcf8e8390396f81b070ac7dc0c1f5 (diff)
downloadtcl-52bfe7018d1a7f4cb93fc25ea27e958bb6fed544.zip
tcl-52bfe7018d1a7f4cb93fc25ea27e958bb6fed544.tar.gz
tcl-52bfe7018d1a7f4cb93fc25ea27e958bb6fed544.tar.bz2
regen
Diffstat (limited to 'unix')
-rwxr-xr-xunix/configure18
1 files changed, 12 insertions, 6 deletions
diff --git a/unix/configure b/unix/configure
index 720be48..eadc6fa 100755
--- a/unix/configure
+++ b/unix/configure
@@ -6324,7 +6324,7 @@ _ACEOF
# Add stuff for zlib
#------------------------------------------------------------------------
-zlib_ok=yes
+tcl_ok=yes
if test "${ac_cv_header_zlib_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for zlib.h" >&5
echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
@@ -6510,7 +6510,7 @@ if test $ac_cv_type_gz_header = yes; then
:
else
- zlib_ok=no
+ tcl_ok=no
{ echo "$as_me:$LINENO: WARNING: todo: Add -Icompat/zlib/include to compile lines" >&5
echo "$as_me: WARNING: todo: Add -Icompat/zlib/include to compile lines" >&2;}
@@ -6518,14 +6518,16 @@ fi
else
- zlib_ok=no
+ tcl_ok=no
{ echo "$as_me:$LINENO: WARNING: todo: Add -Icompat/zlib/include to compile lines" >&5
echo "$as_me: WARNING: todo: Add -Icompat/zlib/include to compile lines" >&2;}
fi
-{ echo "$as_me:$LINENO: checking for library containing deflateSetHeader" >&5
+if test $tcl_ok = yes; then
+
+ { echo "$as_me:$LINENO: checking for library containing deflateSetHeader" >&5
echo $ECHO_N "checking for library containing deflateSetHeader... $ECHO_C" >&6; }
if test "${ac_cv_search_deflateSetHeader+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6608,13 +6610,16 @@ if test "$ac_res" != no; then
else
- zlib_ok=no
+ tcl_ok=no
{ echo "$as_me:$LINENO: WARNING: todo: Add compat/zlib to list of things to build" >&5
echo "$as_me: WARNING: todo: Add compat/zlib to list of things to build" >&2;}
fi
-if test $zlib_ok = yes; then
+fi
+
+if test $tcl_ok = yes; then
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_ZLIB 1
@@ -6622,6 +6627,7 @@ _ACEOF
fi
+
#--------------------------------------------------------------------
# The statements below define a collection of compile flags. This
# macro depends on the value of SHARED_BUILD, and should be called