Merge from trunk

diff --cc configure.in
Simple merge

diff --cc helpers/external_acl/session/Makefile.am
index f25f44255edbdf4f28c0b269132606335b700163,0c45b0a06f00c009a00b807d819e81d9d1a7aba8..40700cbe1cefd85944a70451be2faa9e2b2e4862
--- 1/helpers/external_acl/session/Makefile.am
--- 2/helpers/external_acl/session/Makefile.am
+++ b/helpers/external_acl/session/Makefile.am
@@@ -11,12 -11,6 +11,12 @@@ man_MANS                    = squid_session.
  EXTRA_DIST                    = squid_session.8
  squid_session_SOURCES         = squid_session.c
  
 -LDADD = @LIB_DB@
 +INCLUDES = \
 +      -I$(top_srcdir) \
 +      -I. \
 +      -I$(top_builddir)/include \
 +      -I$(top_srcdir)/include
  
 -INCLUDES      = -I. -I$(top_builddir)/include -I$(top_srcdir)/include
 +LDADD = \
 +      -L$(top_builddir)/squid-compat/libcompat.la \
-       $(LIB_DB)
++      @LIB_DB@

diff --cc src/Makefile.am
Simple merge