From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Tue, 27 May 2014 08:23:05 +0000 (+0200)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_5_0_1~217^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52793564799466eadcedab778701cdfcabcc570e;p=thirdparty%2Fsquid.git

Merged from trunk
---

52793564799466eadcedab778701cdfcabcc570e
diff --cc src/Makefile.am
index 7ded999a86,5480bba3af..fb57de2c2c
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -644,9 -646,7 +646,8 @@@ squid_LDADD = 
  	$(REGEXLIB) \
  	$(ADAPTATION_LIBS) \
  	$(ESI_LIBS) \
- 	$(SSL_LIBS) \
  	$(SNMP_LIBS) \
 +	parser/libsquid-parser.la \
  	$(top_builddir)/lib/libmisccontainers.la \
  	$(top_builddir)/lib/libmiscencoding.la \
  	$(top_builddir)/lib/libmiscutil.la \