[gnunet] branch master updated: build: fix extractor link and detection in meson

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new effcfdff7 build: fix extractor link and detection in meson
effcfdff7 is described below

commit effcfdff7980ea580aeffbabbcc4093677ef2772
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Thu Sep 26 11:37:53 2024 +0200

    build: fix extractor link and detection in meson
---
 contrib/gana               |  2 +-
 contrib/handbook           |  2 +-
 meson.build                | 11 ++++++++---
 src/cli/cadet/meson.build  |  1 +
 src/cli/fs/meson.build     |  3 +++
 src/cli/nse/meson.build    |  5 ++++-
 src/service/fs/meson.build |  2 ++
 src/service/meson.build    |  1 +
 8 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/contrib/gana b/contrib/gana
index a2057ac0e..4c0de3436 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit a2057ac0e3c43950dcfc5024cc0abe6f362e45ba
+Subproject commit 4c0de34360f8baca9d26f5a8ff0681f469a1180e
diff --git a/contrib/handbook b/contrib/handbook
index 57e146d7f..3f20b1641 160000
--- a/contrib/handbook
+++ b/contrib/handbook
@@ -1 +1 @@
-Subproject commit 57e146d7f375860cc3e12ae127c90c215e343a2f
+Subproject commit 3f20b1641b5617394f97d6137978f03bcbd57561
diff --git a/meson.build b/meson.build
index a47892877..d91b22ab6 100644
--- 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
index 09a1965ac..2231a6874 100644
--- 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
index 1b29dd56d..d6fbe4596 100644
--- 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
index 584c7eb71..8ad63f2d9 100644
--- 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
index 9e3e05cf7..dc22381f6 100644
--- 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
index b40ce9422..6dd5148eb 100644
--- 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,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.