Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
configure.ac | 13 -------------
meson.build | 14 ++++++++++++++
meson_options.txt | 2 ++
3 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/configure.ac b/configure.ac
index 445a44f2e79..66fc88bd014 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,19 +40,6 @@ m4_ifndef([AM_SILENT_RULES],
AC_CANONICAL_HOST
-LIBVIRT_ARG_WITH([PACKAGER], [Extra packager name], [no])
-LIBVIRT_ARG_WITH([PACKAGER_VERSION], [Extra packager version], [no])
-if test "x$with_packager" != "xno"
-then
- AC_DEFINE_UNQUOTED([PACKAGER], ["$with_packager"],
- [Extra package name])
-fi
-if test "x$with_packager_version" != "xno"
-then
- AC_DEFINE_UNQUOTED([PACKAGER_VERSION], ["$with_packager_version"],
- [Extra package version])
-fi
-
dnl Where we look for daemons and admin binaries during configure
LIBVIRT_SBIN_PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin"
diff --git a/meson.build b/meson.build
index 07dacf92009..633db2df51a 100644
--- a/meson.build
+++ b/meson.build
@@ -110,6 +110,20 @@ configure_file(
)
+# packager options
+
+packager = get_option('packager')
+packager_version = get_option('packager_version')
+
+if packager != ''
+ conf.set_quoted('PACKAGER', packager)
+endif
+
+if packager_version != ''
+ conf.set_quoted('PACKAGER_VERSION', packager_version)
+endif
+
+
# figure out libvirt version strings
arr_version = meson.project_version().split('.')
diff --git a/meson_options.txt b/meson_options.txt
index 5338ee89b9a..2281faec429 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,5 @@
option('no-git', type: 'boolean', value: false, description: 'Disable git submodule update')
+option('packager', type: 'string', value: '', description: 'Extra packager name')
+option('packager_version', type: 'string', value: '', description: 'Extra packager version')
option('system', type: 'boolean', value: false, description: 'Set install paths to system ones')
option('runstatedir', type: 'string', value: '', description: 'State directory for temporary sockets, pid files, etc')
--
2.26.2
