diff --git a/config.h.meson b/config.h.meson index 55930e1e1..bc26beaaa 100644 --- a/config.h.meson +++ b/config.h.meson @@ -1,4 +1,4 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ +/* config.h. Generated by meson. */ /* Define if building universal (internal helper macro) */ #mesondefine AC_APPLE_UNIVERSAL_BUILD diff --git a/pinos/daemon/meson.build b/pinos/daemon/meson.build index edac7416a..b008b3205 100644 --- a/pinos/daemon/meson.build +++ b/pinos/daemon/meson.build @@ -13,6 +13,14 @@ pinos_c_args = [ '-DG_LOG_DOMAIN=g_log_domain_pinos', ] +conf_config = configuration_data() +conf_install_dir = '@0@/etc/pinos'.format(get_option('prefix')) + +configure_file(input : 'pinos.conf.in', + output : 'pinos.conf', + configuration : conf_config, + install_dir : conf_install_dir) + executable('pinos', pinos_sources, install: true, diff --git a/pinos/daemon/pinos.conf.in b/pinos/daemon/pinos.conf.in index 89b3ac3d9..a96734c72 100644 --- a/pinos/daemon/pinos.conf.in +++ b/pinos/daemon/pinos.conf.in @@ -1 +1 @@ -load-module module-gst +load-module libpinos-module-spa diff --git a/spa/include/spa/meson.build b/spa/include/spa/meson.build index 26c9c953a..73f217b89 100644 --- a/spa/include/spa/meson.build +++ b/spa/include/spa/meson.build @@ -6,7 +6,6 @@ spa_headers = [ 'defs.h', 'dict.h', 'format.h', - 'memory.h', 'monitor.h', 'node-command.h', 'node-event.h',