X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=configure.in;h=a67782c16b24b03b2a2ea13c6ca1403d6d1ed307;hb=cf70a45c4266c4a246c556bafa3fe7cdd46f6ef9;hp=85a2283d8ce6ff04f1f4534059b5eb47b8945162;hpb=60df494d6edf42e4cdf89c7c918c0ba48e731c29;p=privoxy.git

diff --git a/configure.in b/configure.in
index 85a2283d..a67782c1 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl 
-dnl $Id: configure.in,v 1.97 2006/11/21 18:32:46 hal9 Exp $
+dnl $Id: configure.in,v 1.99 2007/01/01 19:36:37 fabiankeil Exp $
 dnl 
 dnl Written by and Copyright (C) 2001 - 2004 the SourceForge
 dnl Privoxy team. http://www.privoxy.org/
@@ -28,6 +28,13 @@ dnl or write to the Free Software Foundation, Inc., 59
 dnl Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 dnl 
 dnl $Log: configure.in,v $
+dnl Revision 1.99  2007/01/01 19:36:37  fabiankeil
+dnl Integrate a modified version of Wil Mahan's
+dnl zlib patch (PR #895531).
+dnl
+dnl Revision 1.98  2006/12/17 19:15:26  fabiankeil
+dnl Added ./configure switch for FEATURE_GRACEFUL_TERMINATION.
+dnl
 dnl Revision 1.97  2006/11/21 18:32:46  hal9
 dnl Setting version to 3.0.7 UNRELEASED for lack of a better setting.
 dnl
@@ -467,7 +474,7 @@ dnl =================================================================
 dnl AutoConf Initialization
 dnl =================================================================
 
-AC_REVISION($Revision: 1.97 $)
+AC_REVISION($Revision: 1.99 $)
 AC_INIT(jcc.c)
 
 if test ! -f config.h.in; then
@@ -678,7 +685,9 @@ dnl additional gcc flags
 dnl =================================================================
 dnl 
 if test "$GCC"; then
-  CFLAGS="-pipe $CFLAGS"
+  if test "$host" != "powerpc-unknown-amigaos"; then
+    CFLAGS="-pipe $CFLAGS"
+  fi
 fi
 
 
@@ -1274,6 +1283,22 @@ AC_ARG_ENABLE(dynamic-pcrs,
 [ if test $enableval = "no"; then have_pcrs=no; fi ])
 
 
+# This check is incomplete. mingw32's zlib is found but the build fails.
+AC_ARG_ENABLE(zlib,
+[  --enable-zlib                   Use an external zlib library to allow decompressing
+                                  data on the fly.],
+[enableval2=$enableval],
+[enableval2=no])
+if test $enableval2 = yes; then
+  AC_CHECK_LIB(z, zlibVersion, , [
+    AC_MSG_ERROR([Unable to find a copy of zlib. The zlib library
+is necessary to enable compresion support. ])
+  ]) 
+  AC_DEFINE(FEATURE_ZLIB,1,
+    [ Define to 1 to use compression through the zlib library. ])
+fi
+
+
 # If we have libpcre and either we also have pcreposix or
 # we don't need pcreposix, then link pcre dynamically; else
 # build it and link statically