[PATCH v1 4/7] logging: Build log manager only when RPC is available

[Michal Privoznik]

The logging manager is very closely tied to RPC. If we are
building without RPC support there's not much use for the
manager, in fact it fails to build.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/libvirt_logging.syms | 18 ++++++++++++++++++
 src/libvirt_private.syms |  9 ---------
 src/logging/meson.build  | 31 ++++++++++++++++++-------------
 3 files changed, 36 insertions(+), 22 deletions(-)
 create mode 100644 src/libvirt_logging.syms

diff --git a/src/libvirt_logging.syms b/src/libvirt_logging.syms
new file mode 100644
index 0000000000..e2a1a7109f
--- /dev/null
+++ b/src/libvirt_logging.syms
@@ -0,0 +1,18 @@
+#
+# Domain logging specific symbols
+#
+
+
+# logging/log_manager.h
+virLogManagerDomainAppendMessage;
+virLogManagerDomainGetLogFilePosition;
+virLogManagerDomainOpenLogFile;
+virLogManagerDomainReadLogFile;
+virLogManagerFree;
+virLogManagerNew;
+
+
+# Let emacs know we want case-insensitive sorting
+# Local Variables:
+# sort-fold-case: t
+# End:
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 7be5b51100..9900bfbe27 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1666,15 +1666,6 @@ virLockManagerPluginUsesState;
 virLockManagerRelease;
 
 
-# logging/log_manager.h
-virLogManagerDomainAppendMessage;
-virLogManagerDomainGetLogFilePosition;
-virLogManagerDomainOpenLogFile;
-virLogManagerDomainReadLogFile;
-virLogManagerFree;
-virLogManagerNew;
-
-
 # security/security_driver.h
 virSecurityDriverLookup;
 
diff --git a/src/logging/meson.build b/src/logging/meson.build
index 996d4265fc..89e06a0d5a 100644
--- a/src/logging/meson.build
+++ b/src/logging/meson.build
@@ -32,20 +32,25 @@ log_daemon_sources = files(
   'log_handler.c',
 )
 
-log_driver_lib = static_library(
-  'virt_log_driver',
-  [
-    log_driver_sources,
-    log_protocol_generated,
-  ],
-  dependencies: [
-    rpc_dep,
-    src_dep,
-    xdr_dep,
-  ],
-)
+if conf.has('WITH_REMOTE')
+  log_driver_lib = static_library(
+    'virt_log_driver',
+    [
+      log_driver_sources,
+      log_protocol_generated,
+    ],
+    dependencies: [
+      rpc_dep,
+      src_dep,
+      xdr_dep,
+    ],
+  )
 
-libvirt_libs += log_driver_lib
+  libvirt_libs += log_driver_lib
+  used_sym_files += 'libvirt_logging.syms'
+else
+  sym_files += 'libvirt_logging.syms'
+endif
 
 if conf.has('WITH_LIBVIRTD')
   log_daemon_generated = custom_target(
-- 
2.32.0