diff options
| author | Philip Withnall <withnall@endlessm.com> | 2017-08-01 09:51:51 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2017-08-03 10:34:42 +0100 |
| commit | 17fb0e8a65ad03083a29a491b05a01d09da9895b (patch) | |
| tree | edcedabbf1597e04e7edf97b76ab20f2b8a814b8 | |
| parent | 280b4247bb2c27ee2502bf31e3d084de0640e8ae (diff) | |
| download | appstream-glib-17fb0e8a65ad03083a29a491b05a01d09da9895b.tar.gz | |
build: Make gperf dependency fully required
Commit 081ced436 made the gperf dependency mandatory, but that seems to
have been partially lost in the migration to Meson. If building without
gperf available, Meson configure would succeed, but then build would
fail due to as-tag-private.h not being generated.
Fix that by removing the conditions for gperf in the meson.build files.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
| -rw-r--r-- | libappstream-glib/meson.build | 27 | ||||
| -rw-r--r-- | meson.build | 5 |
2 files changed, 14 insertions, 18 deletions
diff --git a/libappstream-glib/meson.build b/libappstream-glib/meson.build index 3607dfe..04bb50a 100644 --- a/libappstream-glib/meson.build +++ b/libappstream-glib/meson.build @@ -103,20 +103,19 @@ sources = [ asresources, ] -if gperf.found() - astagpriv = custom_target( - 'gperf as-tag', - output : 'as-tag-private.h', - input : 'as-tag.gperf', - command : [ - gperf, - '@INPUT@', - '--output-file', - '@OUTPUT@' - ] - ) - sources = sources + [astagpriv] -endif +# gperf sources +astagpriv = custom_target( + 'gperf as-tag', + output : 'as-tag-private.h', + input : 'as-tag.gperf', + command : [ + gperf, + '@INPUT@', + '--output-file', + '@OUTPUT@' + ] +) +sources = sources + [astagpriv] install_headers(headers, subdir : 'libappstream-glib') diff --git a/meson.build b/meson.build index c88bbdc..4d468c2 100644 --- a/meson.build +++ b/meson.build @@ -98,10 +98,7 @@ if get_option('enable-stemmer') endif # use gperf for faster string -> enum matching -gperf = find_program('gperf', required : false) -if gperf.found() - conf.set('HAVE_GPERF', 1) -endif +gperf = find_program('gperf', required : true) gnome = import('gnome') i18n = import('i18n') |