summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2008-12-11 14:42:44 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2008-12-11 14:42:44 (GMT)
commit7b78ea6e8daefdb529ab591513dd5804bc6fa5f7 (patch)
treea72794c333a8cf791f9626d1957daf253e4c4b0a
parent5b666291abb11e496bc0915ee0cb4718c8bae64c (diff)
downloadtcl-7b78ea6e8daefdb529ab591513dd5804bc6fa5f7.zip
tcl-7b78ea6e8daefdb529ab591513dd5804bc6fa5f7.tar.gz
tcl-7b78ea6e8daefdb529ab591513dd5804bc6fa5f7.tar.bz2
Slightly less lame configure detection for zlib; still not really right
-rw-r--r--unix/configure.in14
1 files changed, 12 insertions, 2 deletions
diff --git a/unix/configure.in b/unix/configure.in
index c18c603..9dfba00 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to
dnl generate the file "configure", which is run during Tcl installation
dnl to configure the system for the local environment.
#
-# RCS: @(#) $Id: configure.in,v 1.191 2008/12/11 01:21:52 dkf Exp $
+# RCS: @(#) $Id: configure.in,v 1.192 2008/12/11 14:42:44 dkf Exp $
AC_INIT([tcl],[8.6])
AC_PREREQ(2.59)
@@ -117,7 +117,17 @@ SC_ENABLE_SHARED
# Add stuff for zlib
#------------------------------------------------------------------------
-LIBS="$LIBS -lz"
+zlib_ok=yes
+AC_CHECK_HEADER([zlib.h],[],[
+ zlib_ok=no
+ echo TODO: Add -I$srcdir/compat/zlib/include to compile lines...
+])
+AC_SEARCH_LIBS([adler32],[z],[],[
+ zlib_ok=no
+])
+if test $zlib_ok = yes; then
+ AC_DEFINE(HAVE_ZLIB, 1, [Is there an installed zlib?])
+fi
#--------------------------------------------------------------------
# The statements below define a collection of compile flags. This