From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 9 Feb 2009 08:53:49 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~1190^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2504a03f6001b67a97308ea6c3e890847d978f9d;p=thirdparty%2Fsquid.git

Merge from trunk
---

2504a03f6001b67a97308ea6c3e890847d978f9d
diff --cc helpers/external_acl/session/Makefile.am
index f25f44255e,0c45b0a06f..40700cbe1c
--- a/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@