From: Aki Tuomi <cmouse@cmouse.fi>
Date: Thu, 21 May 2015 19:15:01 +0000 (+0300)
Subject: Add GSS libraries when needed
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~79^2~9^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0be816c02062b1ac66842170b01690a0ab4d7bf5;p=thirdparty%2Fpdns.git

Add GSS libraries when needed
---

diff --git a/modules/remotebackend/Makefile.am b/modules/remotebackend/Makefile.am
index e161957ac1..a73a58dd6b 100644
--- a/modules/remotebackend/Makefile.am
+++ b/modules/remotebackend/Makefile.am
@@ -118,6 +118,7 @@ libtestremotebackend_la_SOURCES = \
 	../../pdns/nameserver.cc \
 	../../pdns/rcpgenerator.cc \
 	../../pdns/unix_utility.cc \
+	../../pdns/gss_context.cc ../../pdns/gss_context.hh \
 	httpconnector.cc \
 	pipeconnector.cc \
 	unixconnector.cc \
@@ -154,6 +155,13 @@ libtestremotebackend_la_CPPFLAGS += \
 	$(P11KIT1_CFLAGS)
 endif
 
+if GSS_TSIG
+libtestremotebackend_la_LIBADD += \
+	$(GSS_LIBS)
+libtestremotebackend_la_CPPFLAGS+= \
+	$(GSS_CFLAGS)
+endif
+
 remotebackend_http_test_SOURCES = \
 	test-remotebackend.cc \
 	test-remotebackend-http.cc \
diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 84ec543189..276e2c63f8 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -35,6 +35,10 @@ if LUA
 AM_CPPFLAGS +=$(LUA_CFLAGS)
 endif
 
+if GSS_TSIG
+AM_CPPFLAGS +=$(GSS_CFLAGS)
+endif
+
 EXTRA_DIST = \
 	dnslabeltext.rl \
 	dnslabeltext.cc \
@@ -151,6 +155,7 @@ pdns_server_SOURCES = \
 	dynlistener.cc dynlistener.hh \
 	dynmessenger.hh \
 	ednssubnet.cc ednssubnet.hh \
+	gss_context.cc gss_context.hh \
 	iputils.cc iputils.hh \
 	json.cc json.hh \
 	lock.hh \
@@ -243,6 +248,10 @@ if LUA
 pdns_server_LDADD += $(LUA_LIBS)
 endif
 
+if GSS_TSIG
+pdns_server_LDADD += $(GSS_LIBS)
+endif
+
 pdnssec_SOURCES = \
 	arguments.cc \
 	backends/gsql/gsqlbackend.cc backends/gsql/gsqlbackend.hh \
@@ -334,6 +343,10 @@ pdnssec_SOURCES +=  pkcs11signers.cc pkcs11signers.hh
 pdnssec_LDADD += $(P11KIT1_LIBS)
 endif
 
+if GSS_TSIG
+pdnssec_LDADD += $(GSS_LIBS)
+endif
+
 zone2sql_SOURCES = \
 	arguments.cc \
 	base32.cc \
@@ -538,6 +551,10 @@ saxfr_SOURCES += pkcs11signers.cc pkcs11signers.hh
 saxfr_LDADD += $(P11KIT1_LIBS)
 endif
 
+if GSS_TSIG
+saxfr_LDADD += $(GSS_LIBS)
+endif
+
 dnstcpbench_SOURCES = \
 	base32.cc \
 	base64.cc base64.hh \
@@ -623,6 +640,10 @@ nsec3dig_SOURCES += pkcs11signers.cc pkcs11signers.hh
 nsec3dig_LDADD += $(P11KIT1_LIBS)
 endif
 
+if GSS_TSIG
+nsec3dig_LDADD += $(GSS_LIBS)
+endif
+
 toysdig_SOURCES = \
 	base32.cc \
 	base64.cc base64.hh \
@@ -659,6 +680,7 @@ tsig_tests_SOURCES = \
 	dnsrecords.cc \
 	dnssecinfra.cc \
 	dnswriter.cc dnswriter.hh \
+	gss_context.cc gss_context.hh \
 	logger.cc \
 	misc.cc misc.hh \
 	nsecrecords.cc \
@@ -679,6 +701,9 @@ tsig_tests_SOURCES += pkcs11signers.cc pkcs11signers.hh
 tsig_tests_LDADD += $(P11KIT1_LIBS)
 endif
 
+if GSS_TSIG
+tsig_tests_LDADD += $(GSS_LIBS)
+endif
 speedtest_SOURCES = \
 	base32.cc \
 	base64.cc base64.hh \