[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: UTIL: gnunet-config can now print experi
From: |
gnunet |
Subject: |
[gnunet] branch master updated: UTIL: gnunet-config can now print experimental status. Issue #5708 |
Date: |
Thu, 29 Sep 2022 07:06:48 +0200 |
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 c31abdb6d UTIL: gnunet-config can now print experimental status. Issue
#5708
c31abdb6d is described below
commit c31abdb6dc1b6da4c23b203ffb96db0aa5646915
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Thu Sep 29 14:06:42 2022 +0900
UTIL: gnunet-config can now print experimental status. Issue #5708
---
configure.ac | 8 +++++---
src/util/gnunet-config.c | 19 +++++++++++++++++++
2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index c6e580c8b..1941c01a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1182,6 +1182,8 @@ AC_ARG_ENABLE([experimental],
[enable_experimental=1])],
[enable_experimental=0])
AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "x1"])
+AS_IF([test "x$enable_experimental" = "x1"],
+ AC_DEFINE([GNUNET_EXPERIMENTAL], 1, [Set to 1 is this is an experimental
build]))
# check if malicious code should be compiled (for testing)
AC_ARG_ENABLE([malicious],
@@ -1501,8 +1503,8 @@ AS_IF([test "x$png" = "x1"],
[libpng_msg="no"])
AS_IF([test "x$curl_gnutls" = "x0"],
- [http_client="curl (OpenSSL)"],
- [http_client="curl (GnuTLS)"])
+ [curl_tls_backend="OpenSSL"],
+ [curl_tls_backend="GnuTLS"])
# ifconfig
AS_IF([test "x$IFCONFIG_BINARY" = "xfalse"],
@@ -1581,7 +1583,7 @@ sqlite3: ${sqlite_msg}
MySQL: ${mysql_msg}
PostgreSQL: ${postgres_msg}
-HTTP Client: ${http_client}
+cURL TLS backend: ${curl_tls_backend}
Bluetooth: ${bluetooth_msg}
iptables: ${iptables_msg}
ifconfig: ${ifconfig_msg}
diff --git a/src/util/gnunet-config.c b/src/util/gnunet-config.c
index 2ca78577e..7fda209da 100644
--- a/src/util/gnunet-config.c
+++ b/src/util/gnunet-config.c
@@ -40,6 +40,11 @@ static char *backend_check;
*/
static int cflags;
+/**
+ * Check if this is an experimental build
+ */
+static int is_experimental;
+
/**
* If printing the value of LIBS has been requested.
@@ -73,6 +78,15 @@ run (void *cls,
{
struct GNUNET_CONFIGURATION_ConfigSettings *cs = cls;
+ if (1 == is_experimental)
+ {
+#ifdef GNUNET_EXPERIMENTAL
+ cs->global_ret = 0;
+#else
+ cs->global_ret = 1;
+#endif
+ return;
+ }
if (1 == cflags || 1 == libs || 1 == prefix)
{
char *prefixdir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_PREFIX);
@@ -144,6 +158,11 @@ main (int argc,
gettext_noop (
"Provide an appropriate value for CFLAGS to applications building on
top of GNUnet"),
&cflags),
+ GNUNET_GETOPT_option_flag (
+ 'E',
+ "is-experimental",
+ gettext_noop ("Is this an experimental build of GNUnet"),
+ &is_experimental),
GNUNET_GETOPT_option_flag (
'j',
"libs",
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet] branch master updated: UTIL: gnunet-config can now print experimental status. Issue #5708,
gnunet <=