From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Tue, 10 Nov 2009 11:58:25 +0000 (+0100)
Subject: Fixup some XTRA_LIBS merge errors
X-Git-Tag: SQUID_3_1_0_15~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c62b65c94155224ac986f2b4dd3745373461167c;p=thirdparty%2Fsquid.git

Fixup some XTRA_LIBS merge errors
---

diff --git a/src/Makefile.am b/src/Makefile.am
index ab9596dcd4..17503f56e7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -534,7 +534,7 @@ squid_LDADD = \
 	@SSLLIB@ \
 	-lmiscutil \
 	@EPOLL_LIBS@ \
-	@MINGW_LIBS@ 
+	@MINGW_LIBS@ \
 	@XTRA_LIBS@
 squid_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
 	@DISK_LIBS@ \
@@ -921,7 +921,6 @@ tests_testHttpReply_LDADD=\
 	acl/libstate.la \
 	auth/libauth.la \
 	ip/libip.la \
-	@XTRA_LIBS@ \
 	@SQUID_CPPUNIT_LIBS@ \
 	@SQUID_CPPUNIT_LA@ \
 	-L../lib -lmiscutil \