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.
This commit is contained in:
Xi Ruoyao 2019-09-20 23:32:14 +08:00
parent f576dfbe50
commit c4fb5f033f
3 changed files with 2 additions and 3 deletions

View File

@ -27,8 +27,6 @@
#include <glib-object.h>
#include <valgrind/valgrind.h>
#include <glib.h>
#include <glib/gstdio.h>

View File

@ -21,5 +21,5 @@ endif
libegg = static_library('egg',
libegg_sources,
dependencies: libegg_deps,
include_directories: config_h_dir,
include_directories: [config_h_dir, build_dir],
)

View File

@ -24,6 +24,7 @@ with_gtkdoc = get_option('gtk_doc')
# Some variables
config_h_dir = include_directories('.')
build_dir = include_directories('build')
libsecret_prefix = get_option('prefix')
datadir = get_option('datadir')
includedir = get_option('includedir')