Merged from trunk

diff --cc configure.ac
Simple merge

diff --cc src/Makefile.am
index 7ded999a863ca50adfed64d5291ed5d797abb3d5,5480bba3afc2ae240955a33e9b4b4c22f712c8da..fb57de2c2c1c4516a5c6cd136337d5c4c87b9c56
--- 1/src/Makefile.am
--- 2/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 \