Export conditional state driver symbols only when they are defined

This is necessary for MinGW builds.

diff --git a/src/Makefile.am b/src/Makefile.am
index c6371fb2a5a97822a51035dbbc2e54debc159a8f..08e204dd889bbe2d726a0001d3c821b4e0f4a1b1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -813,13 +813,18 @@ if WITH_MACVTAP
 USED_SYM_FILES += libvirt_macvtap.syms
 endif
 
+if WITH_LIBVIRTD
+USED_SYM_FILES += libvirt_daemon.syms
+endif
+
 EXTRA_DIST += \
   libvirt_public.syms          \
   libvirt_private.syms         \
   libvirt_driver_modules.syms  \
   libvirt_bridge.syms          \
   libvirt_linux.syms           \
-  libvirt_macvtap.syms
+  libvirt_macvtap.syms         \
+  libvirt_daemon.syms
 
 BUILT_SOURCES = libvirt.syms
 

diff --git a/src/libvirt_daemon.syms b/src/libvirt_daemon.syms
new file mode 100644 (file)
index 0000000..eb6e594
--- /dev/null
+++ b/src/libvirt_daemon.syms
@@ -0,0 +1,10 @@
+#
+# These symbols are dependent upon --with-libvirtd via WITH_LIBVIRTD.
+#
+
+# libvirt_internal.h
+virStateInitialize;
+virStateCleanup;
+virStateReload;
+virStateActive;
+virRegisterStateDriver;

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index c5ee23dc6cd8ff31bd97e946493f4214161fab8f..5d30b9026a4047086602ee29b6d01ae96e50e60e 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -285,10 +285,6 @@ iptablesRemoveUdpInput;
 
 
 # libvirt_internal.h
-virStateInitialize;
-virStateCleanup;
-virStateReload;
-virStateActive;
 virDrvSupportsFeature;
 virDomainMigratePrepare;
 virDomainMigratePerform;
@@ -299,7 +295,6 @@ virDomainMigratePrepareTunnel;
 virRegisterDriver;
 virRegisterInterfaceDriver;
 virRegisterNetworkDriver;
-virRegisterStateDriver;
 virRegisterStorageDriver;
 virRegisterDeviceMonitor;
 virRegisterSecretDriver;