logging: Build log manager only when RPC is available

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@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/libvirt_logging.syms b/src/libvirt_logging.syms
new file mode 100644 (file)
index 0000000..e2a1a71
--- /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 f5a816b002fcbd854485f4433beee18a0ec818be..3a8f298dc8f0768fee6fa5891bb4fd8359782409 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1667,15 +1667,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 996d4265fcea8a41f602d8f83ff34bc9d856a568..89e06a0d5a13c3047795719719f484a08ed1197a 100644 (file)
--- 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(