Commit c4fb5f03 authored by Xi Ruoyao's avatar Xi Ruoyao 😿
Browse files

build: Fix FTBFS using meson without valgrind

Now with meson build system libsecret FTBFS without valgrind installed.
Two issues: (1) egg-testing.c depends on valgrind/valgrind.h unnecessarily;
(2) we forgot to add "build" directory as a header directory for meson.

This commit resolves both of them.
parent f576dfbe
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
#include <glib-object.h> #include <glib-object.h>
#include <valgrind/valgrind.h>
#include <glib.h> #include <glib.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
......
...@@ -21,5 +21,5 @@ endif ...@@ -21,5 +21,5 @@ endif
libegg = static_library('egg', libegg = static_library('egg',
libegg_sources, libegg_sources,
dependencies: libegg_deps, dependencies: libegg_deps,
include_directories: config_h_dir, include_directories: [config_h_dir, build_dir],
) )
...@@ -24,6 +24,7 @@ with_gtkdoc = get_option('gtk_doc') ...@@ -24,6 +24,7 @@ with_gtkdoc = get_option('gtk_doc')
# Some variables # Some variables
config_h_dir = include_directories('.') config_h_dir = include_directories('.')
build_dir = include_directories('build')
libsecret_prefix = get_option('prefix') libsecret_prefix = get_option('prefix')
datadir = get_option('datadir') datadir = get_option('datadir')
includedir = get_option('includedir') includedir = get_option('includedir')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment