From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 27 Aug 2009 12:18:40 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~741^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=25a9e62f3f492db48326ba84d95143b8bbe9a9aa;p=thirdparty%2Fsquid.git

Merge from trunk
---

25a9e62f3f492db48326ba84d95143b8bbe9a9aa
diff --cc src/Common.am
index d9239cc542,7f4c8d7fc2..dd10d15c5c
--- a/src/Common.am
+++ b/src/Common.am
@@@ -24,7 -24,8 +24,7 @@@ INCLUDES = 
  ## XXX: Do we really need this? Does auto-dependency tracking work?
  $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h
  
 -
  ## Because compatibility is almost universal. And the link order is important.
- COMPAT_LIBS = \
+ COMPAT_LIB = \
  	-L$(top_builddir)/lib -lmiscutil \
  	$(top_builddir)/compat/libcompat.la