mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-30 21:47:18 +00:00
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.
This commit is contained in:
parent
c770472c48
commit
ae33a7b336
@ -158,7 +158,7 @@ EXTRA_DIST = \
|
|||||||
xml2sexprdata \
|
xml2sexprdata \
|
||||||
xml2vmxdata
|
xml2vmxdata
|
||||||
|
|
||||||
test_helpers = commandhelper ssh test_conf nsslinktest
|
test_helpers = commandhelper ssh test_conf
|
||||||
test_programs = virshtest sockettest \
|
test_programs = virshtest sockettest \
|
||||||
nodeinfotest virbuftest \
|
nodeinfotest virbuftest \
|
||||||
commandtest seclabeltest \
|
commandtest seclabeltest \
|
||||||
@ -191,7 +191,6 @@ test_programs = virshtest sockettest \
|
|||||||
vircaps2xmltest \
|
vircaps2xmltest \
|
||||||
virnetdevtest \
|
virnetdevtest \
|
||||||
virtypedparamtest \
|
virtypedparamtest \
|
||||||
nsstest \
|
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
if WITH_REMOTE
|
if WITH_REMOTE
|
||||||
@ -330,6 +329,11 @@ if WITH_LINUX
|
|||||||
test_programs += virscsitest
|
test_programs += virscsitest
|
||||||
endif WITH_LINUX
|
endif WITH_LINUX
|
||||||
|
|
||||||
|
if WITH_NSS
|
||||||
|
test_helpers += nsslinktest
|
||||||
|
test_programs += nsstest
|
||||||
|
endif WITH_NSS
|
||||||
|
|
||||||
test_programs += storagevolxml2xmltest storagepoolxml2xmltest
|
test_programs += storagevolxml2xmltest storagepoolxml2xmltest
|
||||||
|
|
||||||
test_programs += nodedevxml2xmltest
|
test_programs += nodedevxml2xmltest
|
||||||
|
@ -424,6 +424,7 @@ LIBVIRT_NSS_SOURCES = \
|
|||||||
nss/libvirt_nss.c \
|
nss/libvirt_nss.c \
|
||||||
nss/libvirt_nss.h
|
nss/libvirt_nss.h
|
||||||
|
|
||||||
|
if WITH_NSS
|
||||||
noinst_LTLIBRARIES += nss/libnss_libvirt_impl.la
|
noinst_LTLIBRARIES += nss/libnss_libvirt_impl.la
|
||||||
nss_libnss_libvirt_impl_la_SOURCES = \
|
nss_libnss_libvirt_impl_la_SOURCES = \
|
||||||
$(LIBVIRT_NSS_SOURCES)
|
$(LIBVIRT_NSS_SOURCES)
|
||||||
@ -440,7 +441,6 @@ nss_libnss_libvirt_impl_la_LIBADD = \
|
|||||||
../gnulib/lib/libgnu.la \
|
../gnulib/lib/libgnu.la \
|
||||||
../src/libvirt-nss.la
|
../src/libvirt-nss.la
|
||||||
|
|
||||||
if WITH_NSS
|
|
||||||
nss_libnss_libvirt_la_SOURCES =
|
nss_libnss_libvirt_la_SOURCES =
|
||||||
nss_libnss_libvirt_la_LDFLAGS = \
|
nss_libnss_libvirt_la_LDFLAGS = \
|
||||||
$(VERSION_SCRIPT_FLAGS)$(LIBVIRT_NSS_SYMBOL_FILE) \
|
$(VERSION_SCRIPT_FLAGS)$(LIBVIRT_NSS_SYMBOL_FILE) \
|
||||||
|
Loading…
Reference in New Issue
Block a user