From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Fri, 16 Mar 2012 06:12:44 +0000 (-0600)
Subject: Bug 3263: ssl_crtd: undefined references to squid_curtime
X-Git-Tag: SQUID_3_1_20~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=049bb56b27d93c5f865a38b4e63b5b2ff88e98ad;p=thirdparty%2Fsquid.git

Bug 3263: ssl_crtd: undefined references to squid_curtime
---

diff --git a/src/ssl/Makefile.am b/src/ssl/Makefile.am
index a87de47970..4b475cae77 100644
--- a/src/ssl/Makefile.am
+++ b/src/ssl/Makefile.am
@@ -16,20 +16,23 @@ SSL_CRTD =
 SSL_CRTD_SOURCE =
 endif
 
+## SSL stuff used by main Squid but not by ssl_crtd
 libsslsquid_la_SOURCES = \
 	context_storage.cc \
 	context_storage.h \
 	Config.cc \
 	Config.h \
 	ErrorDetail.cc \
-	ErrorDetail.h
+	ErrorDetail.h \
+	\
+	$(SSL_CRTD_SOURCE)
 
+## SSL stuff used by main Squid and ssl_crtd
 libsslutil_la_SOURCES = \
 	gadgets.cc \
 	gadgets.h \
 	crtd_message.cc \
-	crtd_message.h \
-	$(SSL_CRTD_SOURCE)
+	crtd_message.h
 
 libexec_PROGRAMS = \
 	$(SSL_CRTD)
diff --git a/src/ssl/certificate_db.h b/src/ssl/certificate_db.h
index 94751c0a1a..d45f95fd96 100644
--- a/src/ssl/certificate_db.h
+++ b/src/ssl/certificate_db.h
@@ -6,7 +6,6 @@
 #define SQUID_SSL_CERTIFICATE_DB_H
 
 #include "ssl/gadgets.h"
-#include "ssl_support.h"
 #if HAVE_STRING
 #include <string>
 #endif