Link Squid SNMP library as a .a library directly to avoid conflicts with

system libraries

diff --git a/configure.in b/configure.in
index 674126f82b001af739dc6ced0c4c93a969494b6c..2db3fa7e46cd1b93266e112edb7368306a8e8e58 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 
 dnl  Configuration input file for Squid
 dnl
-dnl  $Id: configure.in,v 1.438 2006/09/16 20:44:21 serassio Exp $
+dnl  $Id: configure.in,v 1.439 2006/09/26 14:45:00 hno Exp $
 dnl
 dnl
 dnl
@@ -11,7 +11,7 @@ AM_CONFIG_HEADER(include/autoconf.h)
 AC_CONFIG_AUX_DIR(cfgaux)
 AC_CONFIG_SRCDIR([src/main.cc])
 AM_INIT_AUTOMAKE([tar-ustar])
-AC_REVISION($Revision: 1.438 $)dnl
+AC_REVISION($Revision: 1.439 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -749,6 +749,18 @@ AC_ARG_ENABLE(delay-pools,
   fi
 ])
 
+AM_CONDITIONAL(ENABLE_CONTENT_ENCODING, false)
+AC_ARG_ENABLE(content-encoding,
+[  --enable-content-encoding   Enable content-encoding to compress content],    
+[ if test "$enableval" = "yes" ; then
+    echo "Content encoding enabled"
+    AC_CHECK_LIB(z, deflate)
+    XTRA_LIBS="$XTRA_LIBS -lz"
+    AC_DEFINE([CONTENT_ENCODING],1,[content encoding support.])
+    AM_CONDITIONAL(ENABLE_CONTENT_ENCODING, true,)
+  fi
+])
+
 AM_CONDITIONAL(USE_ESI, false)
 AC_ARG_ENABLE(esi,
               AC_HELP_STRING([--enable-esi],[Enable ESI for accelerators. Requires libexpat. Enabling ESI will cause squid to follow the Edge Acceleration Specification (www.esi.org). This causes squid to IGNORE client Cache-Control headers. DO NOT use this in a squid configured as a web proxy, ONLY use it in a squid configured for webserver acceleration.]),
@@ -848,7 +860,7 @@ AC_ARG_ENABLE(snmp,
 [ if test "$enableval" = "yes" ; then
     echo "SNMP monitoring enabled"
     AC_DEFINE(SQUID_SNMP,1,[Define to enable SNMP monitoring of Squid])
-    SNMPLIB='-L../snmplib -lsnmp'
+    SNMPLIB='../snmplib/libsnmp.a'
     AM_CONDITIONAL(USE_SNMP, true)
     SNMP_MAKEFILE=./snmplib/Makefile
     makesnmplib=snmplib