diff options
Diffstat (limited to 'contrib/gnunet.m4')
-rw-r--r-- | contrib/gnunet.m4 | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/contrib/gnunet.m4 b/contrib/gnunet.m4 index fe70fbde1..6d9332db3 100644 --- a/contrib/gnunet.m4 +++ b/contrib/gnunet.m4 | |||
@@ -1,7 +1,7 @@ | |||
1 | # Autoconf macro for working with GNUnet | 1 | # Autoconf macro for working with GNUnet |
2 | # This file is in the public domain. | 2 | # This file is in the public domain. |
3 | # | 3 | # |
4 | # AM_PATH_GNUNET([MINIMUM-VERSION = 0.14.2, [ACTION-IF-FOUND, [ACTION-IF-NOT-FOUND]]]) | 4 | # AM_PATH_GNUNET([MINIMUM-VERSION = 0.15.3, [ACTION-IF-FOUND, [ACTION-IF-NOT-FOUND]]]) |
5 | # Find the GNUnet installation, either automatically or through the | 5 | # Find the GNUnet installation, either automatically or through the |
6 | # --with-gnunet-prefix flag | 6 | # --with-gnunet-prefix flag |
7 | # | 7 | # |
@@ -19,14 +19,19 @@ AC_DEFUN([AM_PATH_GNUNET], | |||
19 | [PATH to the GNUnet installation])], | 19 | [PATH to the GNUnet installation])], |
20 | [gnunet_prefix="$withval"], | 20 | [gnunet_prefix="$withval"], |
21 | [gnunet_prefix=""]) | 21 | [gnunet_prefix=""]) |
22 | AC_ARG_ENABLE([debug-log], | ||
23 | [AS_HELP_STRING([--disable-debug-log], | ||
24 | [Disable all DEBUG-level logging])], | ||
25 | [], | ||
26 | [enable_debug_log=yes]) | ||
22 | AC_ARG_VAR([GNUNET_CONFIG],[The gnunet-config tool]) | 27 | AC_ARG_VAR([GNUNET_CONFIG],[The gnunet-config tool]) |
23 | min_gnunet_version=m4_if([$1], ,0.14.2,$1) | 28 | min_gnunet_version=m4_if([$1], ,0.15.3,$1) |
24 | # Make sure the specified version is at least the version with | 29 | # Make sure the specified version is at least the version with |
25 | # the features required to use this macro | 30 | # the features required to use this macro |
26 | AS_VERSION_COMPARE([$min_gnunet_version],[0.14.2], | 31 | AS_VERSION_COMPARE([$min_gnunet_version],[0.15.3], |
27 | [AC_MSG_WARN([The specified GNUnet version $min_gnunet_version is too old.]) | 32 | [AC_MSG_WARN([The specified GNUnet version $min_gnunet_version is too old.]) |
28 | AC_MSG_WARN([The minimum version has been set to 0.14.2]) | 33 | AC_MSG_WARN([The minimum version has been set to 0.15.3]) |
29 | min_gnunet_version="0.14.2"]) | 34 | min_gnunet_version="0.15.3"]) |
30 | AS_IF([test "x${GNUNET_CONFIG+set}" != "xset"], | 35 | AS_IF([test "x${GNUNET_CONFIG+set}" != "xset"], |
31 | [PKG_CHECK_MODULES([GNUNET],[gnunetutil >= $min_gnunet_version], | 36 | [PKG_CHECK_MODULES([GNUNET],[gnunetutil >= $min_gnunet_version], |
32 | [gnunet_pkgconfig=yes],[gnunet_pkgconfig=no]) | 37 | [gnunet_pkgconfig=yes],[gnunet_pkgconfig=no]) |
@@ -57,7 +62,11 @@ AC_DEFUN([AM_PATH_GNUNET], | |||
57 | AC_SUBST([GNUNET_CFLAGS])]) | 62 | AC_SUBST([GNUNET_CFLAGS])]) |
58 | AS_IF([test "x${GNUNET_LIBS+set}" != "xset"], | 63 | AS_IF([test "x${GNUNET_LIBS+set}" != "xset"], |
59 | [GNUNET_LIBS=`$GNUNET_CONFIG --libs` | 64 | [GNUNET_LIBS=`$GNUNET_CONFIG --libs` |
60 | AC_SUBST([GNUNET_LIBS])])]) | 65 | AC_SUBST([GNUNET_LIBS])]) |
66 | AS_IF([test "x$enable_debug_log" = "xno"], | ||
67 | [AC_DEFINE([GNUNET_EXTRA_LOGGING], | ||
68 | [0], | ||
69 | [0 if debug messages should be culled])])]) | ||
61 | AS_UNSET([gnunet_result]) | 70 | AS_UNSET([gnunet_result]) |
62 | AS_UNSET([min_gnunet_version]) | 71 | AS_UNSET([min_gnunet_version]) |
63 | ]) | 72 | ]) |