Add support for building with argp-standalone library

Signed-off-by: Jonathan Dieter <jdieter@gmail.com>

diff --git a/meson.build b/meson.build
index aea2ab9f2844fe04fb7ff2dd7ae46e4822285f42..2af1978a209875fce06531942cdcd1db9e3db787 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -22,6 +22,12 @@ endif
 
 curl_dep = dependency('libcurl')
 
+if not cc.links('#include <argp.h>\nstatic error_t parse_opt (int key, char *arg, struct argp_state *state) { argp_usage(state); }; void main() {}')
+    argplib = cc.find_library('argp')
+else
+    argplib = dependency('', required : false)
+endif
+
 if get_option('with-openssl') == 'disabled'
     openssl_dep = dependency('', required : false)
 else

diff --git a/src/meson.build b/src/meson.build
index f98439eb6efe52b4d24be323e8097d1402be9067..d5ad75aa8a68efc09d419f1d3483aa78df0c9134 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -3,6 +3,7 @@ zck = executable(
     'zck',
     ['zck.c', 'util_common.c'],
     include_directories: inc,
+    dependencies: argplib,
     link_with: zcklib,
     install: true
 )
@@ -10,6 +11,7 @@ unzck = executable(
     'unzck',
     ['unzck.c', 'util_common.c'],
     include_directories: inc,
+    dependencies: argplib,
     link_with: zcklib,
     install: true
 )
@@ -17,7 +19,7 @@ zckdl = executable(
     'zckdl',
     ['zck_dl.c', 'util_common.c'],
     include_directories: inc,
-    dependencies: curl_dep,
+    dependencies: [argplib, curl_dep],
     link_with: zcklib,
     install: true
 )
@@ -25,6 +27,7 @@ zck_gen_zdict = executable(
     'zck_gen_zdict',
     ['zck_gen_zdict.c', 'util_common.c'],
     include_directories: inc,
+    dependencies: argplib,
     link_with: zcklib,
     install: true
 )
@@ -32,6 +35,7 @@ zck_read_header = executable(
     'zck_read_header',
     ['zck_read_header.c', 'util_common.c'],
     include_directories: inc,
+    dependencies: argplib,
     link_with: zcklib,
     install: true
 )
@@ -39,6 +43,8 @@ zck_delta_size = executable(
     'zck_delta_size',
     ['zck_delta_size.c', 'util_common.c', 'memmem.c'],
     include_directories: inc,
+    dependencies: argplib,
     link_with: zcklib,
     install: true
 )
+