Merge branch 'ftbfs-meson-wo-valgrind' into 'master'

build: Fix FTBFS using meson without valgrind

See merge request GNOME/libsecret!37
This commit is contained in:
Daiki Ueno 2019-09-20 15:44:59 +00:00
commit 67680a606e
3 changed files with 2 additions and 3 deletions

View File

@ -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>

View File

@ -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],
) )

View File

@ -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')