External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 04:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

nss: don't try to build nss plugin when disabled

Browse Source 
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.
This commit is contained in:
Roman Bogorodskiy 2016-03-19 19:56:02 +03:00
parent c770472c48
commit ae33a7b336
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/Makefile.am
View File

@ -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

2
tools/Makefile.am
View File

@ -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) \