admin: Build only when RPC is available

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

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

examples/c/admin/meson.build

@@ -8,20 +8,22 @@ example_admin_files = [
   'threadpool_params',
 ]
 
-foreach name : example_admin_files
+if conf.has('WITH_REMOTE')
-  source_file = '@0@.c'.format(name)
+  foreach name : example_admin_files
-  executable(
+    source_file = '@0@.c'.format(name)
-    name,
+    executable(
-    [
+      name,
-      source_file,
+      [
-    ],
+        source_file,
-    include_directories: [
+      ],
-      libvirt_inc,
+      include_directories: [
-    ],
+        libvirt_inc,
-    link_with: [
+      ],
-      libvirt_lib,
+      link_with: [
-      libvirt_admin_lib,
+        libvirt_lib,
-    ],
+        libvirt_admin_lib,
-  )
+      ],
-  install_data(source_file, install_dir: example_dir / 'c' / 'admin')
+    )
-endforeach
+    install_data(source_file, install_dir: example_dir / 'c' / 'admin')
+  endforeach
+endif

src/admin/meson.build

@@ -91,24 +91,26 @@ libvirt_admin_syms_flags = '@0@@1@'.format(
   libvirt_admin_syms_file.full_path(),
 )
 
-admin_driver_lib = static_library(
+if conf.has('WITH_REMOTE')
-  'virt_admin_driver',
+  admin_driver_lib = static_library(
-  [
+    'virt_admin_driver',
-    admin_driver_sources,
+    [
-    admin_driver_generated,
+      admin_driver_sources,
-  ],
+      admin_driver_generated,
-  dependencies: [
+    ],
-    rpc_dep,
+    dependencies: [
-    sasl_dep,
+      rpc_dep,
-    src_dep,
+      sasl_dep,
-    xdr_dep,
+      src_dep,
-  ],
+      xdr_dep,
-)
+    ],
+  )
 
-check_protocols += {
+  check_protocols += {
-  'name': 'admin_protocol',
+    'name': 'admin_protocol',
-  'lib': admin_driver_lib,
+    'lib': admin_driver_lib,
-}
+  }
+endif
 
 virt_conf_files += files('libvirt-admin.conf')
 

src/meson.build

@@ -517,48 +517,48 @@ libvirt_lxc_lib = shared_library(
 
 
 # libvirt-admin.so
-
+if conf.has('WITH_REMOTE')
-libvirt_admin_lib = shared_library(
+  libvirt_admin_lib = shared_library(
-  'virt-admin',
+    'virt-admin',
-  [
+    [
-    admin_sources,
+      admin_sources,
-    admin_client_generated,
+      admin_client_generated,
-    admin_driver_generated,
+      admin_driver_generated,
-    datatypes_sources,
+      datatypes_sources,
-    dtrace_gen_objects,
+      dtrace_gen_objects,
-  ],
+    ],
-  dependencies: [
+    dependencies: [
-    capng_dep,
+      capng_dep,
-    devmapper_dep,
+      devmapper_dep,
-    gnutls_dep,
+      gnutls_dep,
-    libssh2_dep,
+      libssh2_dep,
-    libssh_dep,
+      libssh_dep,
-    sasl_dep,
+      sasl_dep,
-    src_dep,
+      src_dep,
-    rpc_dep,
+      rpc_dep,
-    xdr_dep,
+      xdr_dep,
-    yajl_dep,
+      yajl_dep,
-  ],
+    ],
-  include_directories: [
+    include_directories: [
-    admin_inc_dir,
+      admin_inc_dir,
-    remote_inc_dir,
+      remote_inc_dir,
-  ],
+    ],
-  link_args: [
+    link_args: [
-    libvirt_admin_syms_flags,
+      libvirt_admin_syms_flags,
-    libvirt_nodelete,
+      libvirt_nodelete,
-  ],
+    ],
-  link_with: [
+    link_with: [
-    libvirt_lib,
+      libvirt_lib,
-  ],
+    ],
-  link_depends: [
+    link_depends: [
-    libvirt_admin_syms_file,
+      libvirt_admin_syms_file,
-  ],
+    ],
-  install: true,
+    install: true,
-  install_rpath: libvirt_rpath,
+    install_rpath: libvirt_rpath,
-  version: libvirt_lib_version,
+    version: libvirt_lib_version,
-  soversion: libvirt_so_version,
+    soversion: libvirt_so_version,
-)
+  )
-
+endif
 
 # build libvirt shared modules
 
@@ -919,12 +919,14 @@ if host_machine.system() == 'linux'
     env: runutf8,
   )
 
-  test(
+  if conf.has('WITH_REMOTE')
-    'check-admin-symfile',
+    test(
-    python3_prog,
+      'check-admin-symfile',
-    args: [ check_symfile_prog.path(), libvirt_admin_syms, libvirt_admin_lib ],
+      python3_prog,
-    env: runutf8,
+      args: [ check_symfile_prog.path(), libvirt_admin_syms, libvirt_admin_lib ],
-  )
+      env: runutf8,
+    )
+  endif
 endif
 
 test(

tools/meson.build

@@ -206,27 +206,29 @@ executable(
   install_rpath: libvirt_rpath,
 )
 
-executable(
+if conf.has('WITH_REMOTE')
-  'virt-admin',
+  executable(
-  [
+    'virt-admin',
-    'virt-admin.c',
+    [
-    'virt-admin-completer.c',
+      'virt-admin.c',
-  ],
+      'virt-admin-completer.c',
-  dependencies: [
+    ],
-    tools_dep,
+    dependencies: [
-    readline_dep,
+      tools_dep,
-  ],
+      readline_dep,
-  link_args: [
+    ],
-    coverage_flags,
+    link_args: [
-  ],
+      coverage_flags,
-  link_with: [
+    ],
-    libvirt_admin_lib,
+    link_with: [
-    libvirt_shell_lib,
+      libvirt_admin_lib,
-  ],
+      libvirt_shell_lib,
-  install: true,
+    ],
-  install_dir: bindir,
+    install: true,
-  install_rpath: libvirt_rpath,
+    install_dir: bindir,
-)
+    install_rpath: libvirt_rpath,
+  )
+endif
 
 tools_conf = configuration_data()
 tools_conf.set('PACKAGE', meson.project_name())