From ae33a7b3369e4fe71000ea5f87ad64fe990619ec Mon Sep 17 00:00:00 2001
From: Roman Bogorodskiy <bogorodskiy@gmail.com>
Date: Sat, 19 Mar 2016 19:56:02 +0300
Subject: [PATCH] nss: don't try to build nss plugin when disabled

Even if nss is disabled, the build system tries to build some
targets like libnss_libvirt_impl.la and nsstest. Hide those
under the "if WITH_NSS" block like the rest of NSS plugin bits.
---
 tests/Makefile.am | 8 ++++++--
 tools/Makefile.am | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d80b31730a..b3f1144266 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -158,7 +158,7 @@ EXTRA_DIST =		\
 	xml2sexprdata \
 	xml2vmxdata
 
-test_helpers = commandhelper ssh test_conf nsslinktest
+test_helpers = commandhelper ssh test_conf
 test_programs = virshtest sockettest \
 	nodeinfotest virbuftest \
 	commandtest seclabeltest \
@@ -191,7 +191,6 @@ test_programs = virshtest sockettest \
 	vircaps2xmltest \
 	virnetdevtest \
 	virtypedparamtest \
-	nsstest \
 	$(NULL)
 
 if WITH_REMOTE
@@ -330,6 +329,11 @@ if WITH_LINUX
 test_programs += virscsitest
 endif WITH_LINUX
 
+if WITH_NSS
+test_helpers += nsslinktest
+test_programs += nsstest
+endif WITH_NSS
+
 test_programs += storagevolxml2xmltest storagepoolxml2xmltest
 
 test_programs += nodedevxml2xmltest
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 3218d2f998..4320040dc0 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -424,6 +424,7 @@ LIBVIRT_NSS_SOURCES = \
 	nss/libvirt_nss.c	\
 	nss/libvirt_nss.h
 
+if WITH_NSS
 noinst_LTLIBRARIES += nss/libnss_libvirt_impl.la
 nss_libnss_libvirt_impl_la_SOURCES = \
 	$(LIBVIRT_NSS_SOURCES)
@@ -440,7 +441,6 @@ nss_libnss_libvirt_impl_la_LIBADD = \
 	../gnulib/lib/libgnu.la		\
 	../src/libvirt-nss.la
 
-if WITH_NSS
 nss_libnss_libvirt_la_SOURCES =
 nss_libnss_libvirt_la_LDFLAGS = \
 	$(VERSION_SCRIPT_FLAGS)$(LIBVIRT_NSS_SYMBOL_FILE)	\
-- 
GitLab