------------------------------------------------------------
revno: 12357
revision-id: squid3@treenet.co.nz-20121013060101-1jtmo1c2rzca4hr3
parent: squid3@treenet.co.nz-20121010015203-712d1knoxxozsv7r
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Sat 2012-10-13 00:01:01 -0600
message:
  Portability: permit eCAP build without pkg-config
  
  Windows does not have a port of pkg-config, other OS may be in the same
  situation. That only impacts on Squids ability to confirm the library
  version not on its ability to link and use it.
  
  This reduces some configure errors to warnings when pkg-config is not
  located on the local system.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20121013060101-1jtmo1c2rzca4hr3
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: 962c897a45ac3e35f066922fc51e9df8e9a21d3d
# timestamp: 2012-10-13 06:07:35 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20121010015203-\
#   712d1knoxxozsv7r
# 
# Begin patch
=== modified file 'configure.ac'
--- configure.ac	2012-10-10 01:50:28 +0000
+++ configure.ac	2012-10-13 06:01:01 +0000
@@ -1002,19 +1002,23 @@
 PKG_PROG_PKG_CONFIG
 
 dnl Perform configuration consistency checks for eCAP
-if test "x$squid_opt_use_ecap" = "xyes";
+if test "x$squid_opt_use_ecap" != "xno";
 then
-    dnl eCAP support requires loadable modules, which are enabled by default
-    if test "x$enable_loadable_modules" != "xyes"
-    then
-        AC_MSG_ERROR([eCAP support requires loadable modules. Please do not use --disable-loadable-modules with --enable-ecap.]);
-    fi
+  dnl eCAP support requires loadable modules, which are enabled by default
+  if test "x$enable_loadable_modules" != "xyes"
+  then
+    AC_MSG_ERROR([eCAP support requires loadable modules. Please do not use --disable-loadable-modules with --enable-ecap.])
+  fi
 
+  if test -n "$PKG_CONFIG"; then
     dnl eCAP support requires libecap.
     dnl This Squid supports libecap v0.2.x.
     dnl Use EXT_ prefix to distinguish external libecap (that we check for
     dnl here) from our own convenience ecap library in Makefiles.
-    PKG_CHECK_MODULES(EXT_LIBECAP, [libecap > 0.2 libecap < 0.3])
+    PKG_CHECK_MODULES([EXT_LIBECAP],[libecap >= 0.2.0 libecap < 0.3])
+  else
+    AC_MSG_NOTICE([eCAP support requires pkg-config to verify the correct library version. Trouble may follow.])
+  fi
 fi
 
 AM_CONDITIONAL(USE_ECAP, test "x$squid_opt_use_ecap" = "xyes")