[gnunet] branch master updated: meson: revert AC_SUBST for now

[Admin]

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 66ccd2976 meson: revert AC_SUBST for now
66ccd2976 is described below

commit 66ccd2976c45ba8009da534015bb43c0de508ab2
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Fri Feb 14 14:22:20 2025 +0100

    meson: revert AC_SUBST for now
---
 meson.build                    | 2 ++
 src/include/gnunet_config.h.in | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 30706a6dd..48fd83b2e 100644
--- a/meson.build
+++ b/meson.build
@@ -529,6 +529,8 @@ r = run_command('sh', 'scripts/get_version.sh', '--minor', 
check: true)
 cdata.set('gnunet_minor_version', r.stdout().strip())
 r = run_command('sh', 'scripts/get_version.sh', '--micro', check: true)
 cdata.set('gnunet_micro_version', r.stdout().strip())
+cdata.set10('enable_experimental', get_option('experimental'))
+cdata.set10('extractor', extractor_dep.found())
 cdata.set('PKGDATADIRECTORY', 
get_option('prefix')/get_option('datadir')/'gnunet')
 cdata.set('SYSCONFDIR', get_option('prefix')/get_option('sysconfdir'))
 cdata.set('UNIXONLY', '#') # FIXME unclear if required still...
diff --git a/src/include/gnunet_config.h.in b/src/include/gnunet_config.h.in
index e4272b84e..5dff759ae 100644
--- a/src/include/gnunet_config.h.in
+++ b/src/include/gnunet_config.h.in
@@ -43,7 +43,7 @@
 #define GNUNET_MICRO_VERSION @gnunet_micro_version@
 
 /* Set to 1 is this is an experimental build */
-#define GNUNET_EXPERIMENTAL @HAVE_EXPERIMENTAL@
+#define GNUNET_EXPERIMENTAL @enable_experimental@
 
 /* Set to 1 if GnuTLS has DANE support */
 #define GNUNET_CURL_GNUTLS @curl_gnutls@
@@ -53,6 +53,6 @@
  * libextractor, which means that callers to the API must use also use
  * libextractor.
  */
-#define GNUNET_FS_EXTRACTOR_ENABLED @HAVE_EXTRACTOR@
+#define GNUNET_FS_EXTRACTOR_ENABLED @extractor@
 
 #endif

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