commit effcfdff7980ea580aeffbabbcc4093677ef2772
parent 791856a09f3b707b0aad93d0545c3d7fd1ff0dc4
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date: Thu, 26 Sep 2024 11:37:53 +0200
build: fix extractor link and detection in meson
Diffstat:
6 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/meson.build b/meson.build
@@ -61,9 +61,6 @@ if logging_opt == 'veryverbose'
endif
-# FIXME
-cdata.set('extractor', 0)
-
cdata.set('PKGDATADIRECTORY', get_option('prefix')/get_option('datadir')/'gnunet')
cdata.set('SYSCONFDIR', get_option('prefix')/get_option('sysconfdir'))
# Various checks
@@ -204,6 +201,14 @@ if not sodium_dep.found()
error('libsodium version >=1.0.18 required')
endif
endif
+extractor_dep = dependency('libextractor', required : false)
+if not extractor_dep.found()
+ extractor_dep = cc.find_library('extractor', required : false)
+endif
+if extractor_dep.found()
+ add_project_arguments('-DHAVE_LIBEXTRACTOR', language : 'c')
+ add_project_arguments('-DHAVE_EXTRACTOR_H', language : 'c')
+endif
quic_dep = dependency('libquiche', required : false)
if not quic_dep.found()
quic_dep = cc.find_library('quiche', required : false)
diff --git a/src/cli/cadet/meson.build b/src/cli/cadet/meson.build
@@ -1,6 +1,7 @@
executable ('gnunet-cadet',
['gnunet-cadet.c'],
dependencies: [libgnunetcadet_dep,
+ extractor_dep,
libgnunetutil_dep,
libgnunetcore_dep,
libgnunetdht_dep,
diff --git a/src/cli/fs/meson.build b/src/cli/fs/meson.build
@@ -1,6 +1,7 @@
executable ('gnunet-search',
'gnunet-search.c',
dependencies: [libgnunetfs_dep,
+ extractor_dep,
libgnunetutil_dep],
include_directories: [incdir, configuration_inc],
install: true,
@@ -22,6 +23,7 @@ executable ('gnunet-auto-share',
executable ('gnunet-directory',
'gnunet-directory.c',
dependencies: [libgnunetfs_dep,
+ extractor_dep,
libgnunetutil_dep],
include_directories: [incdir, configuration_inc],
install: true,
@@ -43,6 +45,7 @@ executable ('gnunet-fs',
executable ('gnunet-publish',
'gnunet-publish.c',
dependencies: [libgnunetfs_dep,
+ extractor_dep,
libgnunetidentity_dep,
libgnunetutil_dep],
include_directories: [incdir, configuration_inc],
diff --git a/src/cli/nse/meson.build b/src/cli/nse/meson.build
@@ -1,6 +1,9 @@
executable ('gnunet-nse',
['gnunet-nse.c'],
- dependencies: [libgnunetnse_dep, m_dep, libgnunetutil_dep],
+ dependencies: [libgnunetnse_dep,
+ m_dep,
+ extractor_dep,
+ libgnunetutil_dep],
include_directories: [incdir, configuration_inc],
install: true,
install_dir: get_option('bindir'))
diff --git a/src/service/fs/meson.build b/src/service/fs/meson.build
@@ -45,6 +45,7 @@ libgnunetfs = library('gnunetfs',
soversion: '2',
version: '2.1.1',
dependencies: [libgnunetutil_dep,
+ extractor_dep,
libgnunetdatastore_dep,
libgnunetstatistics_dep,
unistr_dep],
@@ -74,6 +75,7 @@ executable ('gnunet-service-fs',
executable ('gnunet-helper-fs-publish',
['gnunet-helper-fs-publish.c'],
dependencies: [libgnunetfs_dep,
+ extractor_dep,
libgnunetutil_dep,
libgnunetblock_dep],
include_directories: [incdir, configuration_inc],
diff --git a/src/service/meson.build b/src/service/meson.build
@@ -50,6 +50,7 @@ libgnunet = library('gnunet',
gnunet_src,
dependencies: [
mhd_dep,
+ extractor_dep,
sodium_dep,
gcrypt_dep,
curl_dep,
