summaryrefslogtreecommitdiffstats
path: root/generic/tclBasic.c
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2008-12-12 16:18:09 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2008-12-12 16:18:09 (GMT)
commita5fbabae01fb74139bbfe1c34061e2458395cba5 (patch)
tree3f8eb53a3165efd0a8a534427ad6f88c4520bb6c /generic/tclBasic.c
parent93b82f20898aee2279608c81083e429192114e7a (diff)
downloadtcl-a5fbabae01fb74139bbfe1c34061e2458395cba5.zip
tcl-a5fbabae01fb74139bbfe1c34061e2458395cba5.tar.gz
tcl-a5fbabae01fb74139bbfe1c34061e2458395cba5.tar.bz2
Make a bad zlib install less fatal to rest of Tcl for now.
Diffstat (limited to 'generic/tclBasic.c')
-rw-r--r--generic/tclBasic.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index c8928ec..cfc88cc 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -16,7 +16,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclBasic.c,v 1.376 2008/12/11 01:21:52 dkf Exp $
+ * RCS: @(#) $Id: tclBasic.c,v 1.377 2008/12/12 16:18:09 dkf Exp $
*/
#include "tclInt.h"
@@ -914,9 +914,16 @@ Tcl_CreateInterp(void)
Tcl_Panic(Tcl_GetString(Tcl_GetObjResult(interp)));
}
+ /*
+ * Only build in zlib support if we've successfully detected a library to
+ * compile and link against.
+ */
+
+#ifdef HAVE_ZLIB
if (TclZlibInit(interp) != TCL_OK) {
Tcl_Panic(Tcl_GetString(Tcl_GetObjResult(interp)));
}
+#endif
TOP_CB(iPtr) = NULL;
return interp;