[frogr] meson: Fix build when libgcrypt provides a .pc file



commit 3a3a4741e720e94283ec518cc5b25dd85d9b5af6
Author: Mario Sanchez Prada <msanchez gnome org>
Date:   Tue May 23 22:19:08 2017 +0100

    meson: Fix build when libgcrypt provides a .pc file
    
    I forgot to merge the two lines setting the define in config.h into
    one, and in this case I was using set() instead of set_quoted(),
    which generated an invalid macro (unquoted string).

 meson.build |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index 6e31b31..e72c3ef 100644
--- a/meson.build
+++ b/meson.build
@@ -38,14 +38,13 @@ json_glib = dependency('json-glib-1.0', version: '>=@0@'.format(json_glib_ver))
 
 # gcrypt might not provide a .pc file
 gcrypt = dependency('libgcrypt', version: '>=@0@'.format(gcrypt_ver), required: false)
-if gcrypt.found()
-    frogr_conf.set('LIBGCRYPT_MIN_VERSION', gcrypt_ver)
-else
+if not gcrypt.found()
     message('gcrypt not found via pkg-config, using meson.find_library()...')
     gcrypt = compiler.find_library('libgcrypt')
-    frogr_conf.set_quoted('LIBGCRYPT_MIN_VERSION', gcrypt_ver)
 endif
 
+frogr_conf.set_quoted('LIBGCRYPT_MIN_VERSION', gcrypt_ver)
+
 # Optional GtkHeaderBar
 if get_option('enable-header-bar')
     gtk = dependency('gtk+-3.0', version: '>=3.12', required: false)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]