From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Tue, 27 Mar 2012 16:52:31 +0000 (+0300)
Subject: Merged from trunk (r12098,  v3.2.0.16+).
X-Git-Tag: BumpSslServerFirst.take08~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d2c3030de9e34b3c0e7efa8f0cf3098d17fe0bfe;p=thirdparty%2Fsquid.git

Merged from trunk (r12098,  v3.2.0.16+).
---

d2c3030de9e34b3c0e7efa8f0cf3098d17fe0bfe
diff --cc src/ssl/Makefile.am
index 519c75f6be,f49a7a3370..d4a96cc40a
--- a/src/ssl/Makefile.am
+++ b/src/ssl/Makefile.am
@@@ -30,11 -31,12 +31,14 @@@ libsslsquid_la_SOURCES = 
  	ErrorDetail.h \
  	ErrorDetailManager.cc \
  	ErrorDetailManager.h \
 +	ServerBump.cc \
 +	ServerBump.h \
  	support.cc \
- 	support.h
+ 	support.h \
+ 	\
+ 	$(SSL_CRTD_SOURCE)
  
+ ## SSL stuff used by main Squid and ssl_crtd
  libsslutil_la_SOURCES = \
  	gadgets.cc \
  	gadgets.h \