From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Fri, 16 Mar 2012 00:52:11 +0000 (-0600)
Subject: Bug 3263: ssl_crtd: undefined references to squid_curtime
X-Git-Tag: SQUID_3_2_0_17~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=065ba308e92d091f9aa11422c6051691b24a53b5;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 e73e9db059..f49a7a3370 100644
--- a/src/ssl/Makefile.am
+++ b/src/ssl/Makefile.am
@@ -21,6 +21,7 @@ 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 \
@@ -31,14 +32,16 @@ libsslsquid_la_SOURCES = \
 	ErrorDetailManager.cc \
 	ErrorDetailManager.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 \
 	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 3035251431..b9832c1061 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