BUILD: Move gnunet_config.h to gnunet_private_config.h and add new, partially generated gnunet_config.h

9 files changed, 59 insertions, 6 deletions

diff --git a/src/gns/nss/nss_gns.c b/src/gns/nss/nss_gns.c
index ff34cedd5..b05cfff55 100644
--- a/src/gns/nss/nss_gns.c
+++ b/src/gns/nss/nss_gns.c
@@ -19,7 +19,7 @@
     USA.
  ***/
 
-#include <gnunet_config.h>
+#include <gnunet_private_config.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
diff --git a/src/include/.gitignore b/src/include/.gitignore
index 9da6d8eea..9529b45c3 100644
--- a/src/include/.gitignore
+++ b/src/include/.gitignore
@@ -2,3 +2,4 @@ gnunet_error_codes.h
 gnu_name_system_record_flags.h
 gnu_name_system_record_types.h
 gnunet_signatures.h
+!gnunet_config.h.in
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 19450968c..fa964f672 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -11,6 +11,7 @@ EXTRA_DIST = \
 
 gnunetinclude_HEADERS = \
   platform.h \
+  gnunet_config.h \
   gnunet_platform.h \
   gettext.h \
   compat.h \
diff --git a/src/include/gnunet_config.h.in b/src/include/gnunet_config.h.in
new file mode 100644
index 000000000..4eb00388f
--- /dev/null
+++ b/src/include/gnunet_config.h.in
@@ -0,0 +1,51 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2022 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+#ifndef GNUNET_CONFIG_H
+#define GNUNET_CONFIG_H
+
+/**
+ * @author Martin Schanzenbach
+ *
+ * @file
+ * Convenience header including public (!) information on the
+ * installed GNUnet configuration.
+ *
+ */
+
+/* The version of GNUnet */
+#define GNUNET_VERSION "@gnunet_version@"
+
+/* Major version */
+#define GNUNET_MAJOR_VERSION 0
+
+/* Micro version */
+#define GNUNET_MINOR_VERSION 18
+
+/* Mico version */
+#define GNUNET_MICRO_VERSION 2
+
+/* Set to 1 is this is an experimental build */
+#define GNUNET_EXPERIMENTAL @enable_experimental@
+
+/* Define to 1 if GnuTLS has DANE support */
+#define GNUNET_CURL_GNUTLS @curl_gnutls@
+
+#endif
diff --git a/src/include/platform.h b/src/include/platform.h
index e44f9f51a..deca323d1 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -34,7 +34,7 @@
 #ifndef HAVE_USED_CONFIG_H
 #define HAVE_USED_CONFIG_H
 #if HAVE_CONFIG_H
-#include "gnunet_config.h"
+#include "gnunet_private_config.h"
 #endif
 #endif
 
diff --git a/src/nat/gnunet-helper-nat-client.c b/src/nat/gnunet-helper-nat-client.c
index 0271d6e0f..b86ab591c 100644
--- a/src/nat/gnunet-helper-nat-client.c
+++ b/src/nat/gnunet-helper-nat-client.c
@@ -43,7 +43,7 @@
  */
 #if HAVE_CONFIG_H
 /* Just needed for HAVE_SOCKADDR_IN_SIN_LEN test macro! */
-#include "gnunet_config.h"
+#include "gnunet_private_config.h"
 #else
 #define _GNU_SOURCE
 #endif
diff --git a/src/nat/gnunet-helper-nat-server.c b/src/nat/gnunet-helper-nat-server.c
index 38d7d22c8..0ea68d46b 100644
--- a/src/nat/gnunet-helper-nat-server.c
+++ b/src/nat/gnunet-helper-nat-server.c
@@ -44,7 +44,7 @@
  */
 #if HAVE_CONFIG_H
 /* Just needed for HAVE_SOCKADDR_IN_SIN_LEN test macro! */
-#include "gnunet_config.h"
+#include "gnunet_private_config.h"
 #else
 #define _GNU_SOURCE
 #endif
diff --git a/src/transport/gnunet-helper-transport-bluetooth.c b/src/transport/gnunet-helper-transport-bluetooth.c
index 9706f57ab..2fc61cd91 100644
--- a/src/transport/gnunet-helper-transport-bluetooth.c
+++ b/src/transport/gnunet-helper-transport-bluetooth.c
@@ -19,7 +19,7 @@
 
      SPDX-License-Identifier: AGPL3.0-or-later
  */
-#include "gnunet_config.h"
+#include "gnunet_private_config.h"
 #include "gnunet_platform.h"
 
 #include <bluetooth/bluetooth.h>
diff --git a/src/transport/gnunet-helper-transport-wlan.c b/src/transport/gnunet-helper-transport-wlan.c
index 0f93ca918..e2b133c06 100644
--- a/src/transport/gnunet-helper-transport-wlan.c
+++ b/src/transport/gnunet-helper-transport-wlan.c
@@ -109,7 +109,7 @@
 /*
  * parts taken from aircrack-ng, parts changend.
  */
-#include "gnunet_config.h"
+#include "gnunet_private_config.h"
 #include "gnunet_platform.h"
 #include <netpacket/packet.h>
 #include <linux/if_ether.h>