Some NWFilter symbols are conditional and have to be exported conditional

diff --git a/src/Makefile.am b/src/Makefile.am
index 66dc34999e6cd2615fe0b4dc7511975ecff3904c..17b2226bba5cdbffe0c911fe5303648b6acbc03f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -884,6 +884,10 @@ if WITH_LIBVIRTD
 USED_SYM_FILES += libvirt_daemon.syms
 endif
 
+if WITH_NWFILTER
+USED_SYM_FILES += libvirt_nwfilter.syms
+endif
+
 EXTRA_DIST += \
   libvirt_public.syms          \
   libvirt_private.syms         \
@@ -891,7 +895,8 @@ EXTRA_DIST += \
   libvirt_bridge.syms          \
   libvirt_linux.syms           \
   libvirt_macvtap.syms         \
-  libvirt_daemon.syms
+  libvirt_daemon.syms          \
+  libvirt_nwfilter.syms
 
 BUILT_SOURCES += libvirt.syms libvirt.def
 

diff --git a/src/libvirt_nwfilter.syms b/src/libvirt_nwfilter.syms
new file mode 100644 (file)
index 0000000..106415f
--- /dev/null
+++ b/src/libvirt_nwfilter.syms
@@ -0,0 +1,14 @@
+#
+# These symbols are dependent on WITH_NWFILTER.
+#
+
+
+# nwfilter_gentech_driver.h
+virNWFilterInstantiateFilter;
+virNWFilterTeardownFilter;
+
+
+# nwfilter_learnipaddr.h
+virNWFilterGetIpAddrForIfname;
+virNWFilterDelIpAddrForIfname;
+virNWFilterLookupLearnReq;

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 7950bcd2457eca10ade289904e8e1aaf359682ab..f8e9d01bb5e1e31422ce96b430f1cd6f1f5e98a8 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -502,7 +502,7 @@ virNWFilterLockFilterUpdates;
 virNWFilterUnlockFilterUpdates;
 
 
-#nwfilter_params.h
+# nwfilter_params.h
 virNWFilterHashTableCreate;
 virNWFilterHashTableFree;
 virNWFilterHashTablePut;
@@ -510,17 +510,6 @@ virNWFilterHashTablePutAll;
 virNWFilterHashTableRemoveEntry;
 
 
-# nwfilter_gentech_driver.h
-virNWFilterInstantiateFilter;
-virNWFilterTeardownFilter;
-
-
-# nwfilter_learnipaddr.h
-virNWFilterGetIpAddrForIfname;
-virNWFilterDelIpAddrForIfname;
-virNWFilterLookupLearnReq;
-
-
 # pci.h
 pciGetDevice;
 pciFreeDevice;