diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2022-12-04 15:01:11 +0900 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2022-12-04 15:01:11 +0900 |
commit | cbe225ddce5627c59902cfdb9524dead675d19d0 (patch) | |
tree | 4587edeca96cc30598d054cf57b1ce2388140a40 /configure.ac | |
parent | 124480c8af13a9cb82d64f9103c55ae64f36ceda (diff) | |
download | gnunet-cbe225ddce5627c59902cfdb9524dead675d19d0.tar.gz gnunet-cbe225ddce5627c59902cfdb9524dead675d19d0.zip |
BUILD: Move gnunet_config.h to gnunet_private_config.h and add new, partially generated gnunet_config.h
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 54eb73a92..04c539bf3 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -22,10 +22,14 @@ | |||
22 | AC_PREREQ([2.69]) | 22 | AC_PREREQ([2.69]) |
23 | AC_INIT([gnunet],[m4_esyscmd_s(sh contrib/get_version.sh)],[bug-gnunet@gnu.org]) | 23 | AC_INIT([gnunet],[m4_esyscmd_s(sh contrib/get_version.sh)],[bug-gnunet@gnu.org]) |
24 | 24 | ||
25 | gnunet_version=m4_esyscmd_s(sh contrib/get_version.sh) | ||
26 | |||
27 | AC_SUBST([gnunet_version]) | ||
28 | |||
25 | AC_CONFIG_AUX_DIR([build-aux]) | 29 | AC_CONFIG_AUX_DIR([build-aux]) |
26 | AC_CONFIG_MACRO_DIRS([m4]) | 30 | AC_CONFIG_MACRO_DIRS([m4]) |
27 | 31 | ||
28 | AC_CONFIG_HEADERS([gnunet_config.h]) | 32 | AC_CONFIG_HEADERS([gnunet_private_config.h]) |
29 | 33 | ||
30 | AC_CANONICAL_TARGET | 34 | AC_CANONICAL_TARGET |
31 | AC_CANONICAL_HOST | 35 | AC_CANONICAL_HOST |
@@ -735,7 +739,7 @@ AC_RUN_IFELSE( | |||
735 | curl_gnutls=0]) | 739 | curl_gnutls=0]) |
736 | LIBS=$OLD_LIBS | 740 | LIBS=$OLD_LIBS |
737 | AM_CONDITIONAL([HAVE_GNUTLS_CURL], [test "x$curl_gnutls" = "x1"]) | 741 | AM_CONDITIONAL([HAVE_GNUTLS_CURL], [test "x$curl_gnutls" = "x1"]) |
738 | 742 | AC_SUBST([curl_gnutls]) | |
739 | 743 | ||
740 | # Even if curl is found, we check for this constant in order to determine | 744 | # Even if curl is found, we check for this constant in order to determine |
741 | # if we can use this feature. | 745 | # if we can use this feature. |
@@ -1186,6 +1190,8 @@ AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "x1"]) | |||
1186 | AS_IF([test "x$enable_experimental" = "x1"], | 1190 | AS_IF([test "x$enable_experimental" = "x1"], |
1187 | AC_DEFINE([GNUNET_EXPERIMENTAL], 1, [Set to 1 is this is an experimental build])) | 1191 | AC_DEFINE([GNUNET_EXPERIMENTAL], 1, [Set to 1 is this is an experimental build])) |
1188 | 1192 | ||
1193 | AC_SUBST([enable_experimental]) | ||
1194 | |||
1189 | # check if malicious code should be compiled (for testing) | 1195 | # check if malicious code should be compiled (for testing) |
1190 | AC_ARG_ENABLE([malicious], | 1196 | AC_ARG_ENABLE([malicious], |
1191 | [AS_HELP_STRING([--enable-malicious], | 1197 | [AS_HELP_STRING([--enable-malicious], |
@@ -1326,6 +1332,7 @@ src/hello/Makefile | |||
1326 | src/identity/Makefile | 1332 | src/identity/Makefile |
1327 | src/identity/identity.conf | 1333 | src/identity/identity.conf |
1328 | src/include/Makefile | 1334 | src/include/Makefile |
1335 | src/include/gnunet_config.h | ||
1329 | src/integration-tests/Makefile | 1336 | src/integration-tests/Makefile |
1330 | src/json/Makefile | 1337 | src/json/Makefile |
1331 | src/hostlist/Makefile | 1338 | src/hostlist/Makefile |