summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure1136
1 files changed, 393 insertions, 743 deletions
diff --git a/configure b/configure
index 346f99f..26445fe 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for knot 3.3.9.
+# Generated by GNU Autoconf 2.71 for knot 3.4.0.
#
# Report bugs to <knot-dns@labs.nic.cz>.
#
@@ -621,8 +621,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='knot'
PACKAGE_TARNAME='knot'
-PACKAGE_VERSION='3.3.9'
-PACKAGE_STRING='knot 3.3.9'
+PACKAGE_VERSION='3.4.0'
+PACKAGE_STRING='knot 3.4.0'
PACKAGE_BUGREPORT='knot-dns@labs.nic.cz'
PACKAGE_URL=''
@@ -663,14 +663,6 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
-HAVE_MAKEINFO_FALSE
-HAVE_MAKEINFO_TRUE
-HAVE_PDFLATEX_FALSE
-HAVE_PDFLATEX_TRUE
-HAVE_SPHINXBUILD_FALSE
-HAVE_SPHINXBUILD_TRUE
-PDFLATEX
-SPHINXBUILD
OSS_FUZZ_FALSE
OSS_FUZZ_TRUE
FUZZER_FALSE
@@ -695,8 +687,6 @@ libmnl_LIBS
libmnl_CFLAGS
libnghttp2_LIBS
libnghttp2_CFLAGS
-libidn_LIBS
-libidn_CFLAGS
libidn2_LIBS
libidn2_CFLAGS
embedded_libngtcp2_LIBS
@@ -782,12 +772,13 @@ SHARED_MODULE_authsignal_FALSE
SHARED_MODULE_authsignal_TRUE
STATIC_MODULE_authsignal_FALSE
STATIC_MODULE_authsignal_TRUE
-liburcu_PKGCONFIG
liburcu_LIBS
liburcu_CFLAGS
malloc_LIBS
libkqueue_LIBS
libkqueue_CFLAGS
+libdbus_LIBS
+libdbus_CFLAGS
systemd_LIBS
systemd_CFLAGS
libxdp_LIBS
@@ -802,10 +793,14 @@ gnutls_LIBS
gnutls_CFLAGS
FAST_PARSER_FALSE
FAST_PARSER_TRUE
-HAVE_LIBUTILS_FALSE
-HAVE_LIBUTILS_TRUE
+HAVE_PDFLATEX_FALSE
+HAVE_PDFLATEX_TRUE
HAVE_DOCS_FALSE
HAVE_DOCS_TRUE
+PDFLATEX
+SPHINXBUILD
+HAVE_LIBUTILS_FALSE
+HAVE_LIBUTILS_TRUE
HAVE_UTILS_FALSE
HAVE_UTILS_TRUE
HAVE_DAEMON_FALSE
@@ -979,9 +974,9 @@ enable_recvmmsg
enable_xdp
enable_reuseport
enable_systemd
+enable_dbus
with_socket_polling
with_memory_allocator
-with_urcu
with_module_authsignal
with_module_cookies
with_module_dnsproxy
@@ -1029,6 +1024,8 @@ libxdp_CFLAGS
libxdp_LIBS
systemd_CFLAGS
systemd_LIBS
+libdbus_CFLAGS
+libdbus_LIBS
libkqueue_CFLAGS
libkqueue_LIBS
liburcu_CFLAGS
@@ -1047,8 +1044,6 @@ libngtcp2_CFLAGS
libngtcp2_LIBS
libidn2_CFLAGS
libidn2_LIBS
-libidn_CFLAGS
-libidn_LIBS
libnghttp2_CFLAGS
libnghttp2_LIBS
libmnl_CFLAGS
@@ -1603,7 +1598,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures knot 3.3.9 to adapt to many kinds of systems.
+\`configure' configures knot 3.4.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1674,7 +1669,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of knot 3.3.9:";;
+ short | recursive ) echo "Configuration of knot 3.4.0:";;
esac
cat <<\_ACEOF
@@ -1706,6 +1701,8 @@ Optional Features:
enable SO_REUSEPORT(_LB) support [default=auto]
--enable-systemd=auto|yes|no
enable systemd integration [default=auto]
+ --enable-dbus=auto|systemd|libdbus|no
+ enable D-bus support [default=auto]
--enable-dnstap Enable dnstap support for kdig (requires fstrm,
protobuf-c)
--enable-maxminddb=auto|yes|no
@@ -1742,7 +1739,6 @@ Optional Packages:
--with-memory-allocator=auto|LIBRARY
Use specific memory allocator for the server (e.g.
jemalloc) [default=auto]
- --with-urcu=DIR where to find userspace-rcu library
--with-module-authsignal=yes|shared|no
Build 'authsignal' module [default="yes"]
--with-module-cookies=yes|shared|no
@@ -1773,7 +1769,7 @@ Optional Packages:
--with-conf-mapsize=NUM Configuration DB mapsize in MiB
[default=$conf_mapsize_default]
- --with-libidn=DIR Support IDN (needs GNU libidn2 or libidn)
+ --with-libidn=DIR Support IDN (needs GNU libidn2)
--with-libnghttp2=DIR Support DoH (needs libnghttp2)
--with-sanitizer Compile with sanitizer [default=no]
--with-fuzzer Compile with libfuzzer [default=no]
@@ -1808,6 +1804,10 @@ Some influential environment variables:
C compiler flags for systemd, overriding pkg-config
systemd_LIBS
linker flags for systemd, overriding pkg-config
+ libdbus_CFLAGS
+ C compiler flags for libdbus, overriding pkg-config
+ libdbus_LIBS
+ linker flags for libdbus, overriding pkg-config
libkqueue_CFLAGS
C compiler flags for libkqueue, overriding pkg-config
libkqueue_LIBS
@@ -1842,9 +1842,6 @@ Some influential environment variables:
C compiler flags for libidn2, overriding pkg-config
libidn2_LIBS
linker flags for libidn2, overriding pkg-config
- libidn_CFLAGS
- C compiler flags for libidn, overriding pkg-config
- libidn_LIBS linker flags for libidn, overriding pkg-config
libnghttp2_CFLAGS
C compiler flags for libnghttp2, overriding pkg-config
libnghttp2_LIBS
@@ -1923,7 +1920,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-knot configure 3.3.9
+knot configure 3.4.0
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2274,7 +2271,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by knot $as_me 3.3.9, which was
+It was created by knot $as_me 3.4.0, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -2865,7 +2862,6 @@ as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H"
as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H"
as_fn_append ac_header_c_list " pthread_np.h pthread_np_h HAVE_PTHREAD_NP_H"
-as_fn_append ac_header_c_list " stdatomic.h stdatomic_h HAVE_STDATOMIC_H"
as_fn_append ac_header_c_list " sys/uio.h sys_uio_h HAVE_SYS_UIO_H"
as_fn_append ac_header_c_list " bsd/string.h bsd_string_h HAVE_BSD_STRING_H"
@@ -3549,7 +3545,7 @@ fi
# Define the identity of the package.
PACKAGE='knot'
- VERSION='3.3.9'
+ VERSION='3.4.0'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -5196,22 +5192,22 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
# Update library versions
# https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
- libknot_VERSION_INFO="-version-info 14:0:0"
+ libknot_VERSION_INFO="-version-info 15:0:0"
- libknot_SOVERSION="14"
+ libknot_SOVERSION="15"
case $host_os in #(
darwin*) :
- libknot_SONAME="libknot.14.dylib"
+ libknot_SONAME="libknot.15.dylib"
;; #(
cygwin*) :
- libknot_SONAME="cygknot-14.dll"
+ libknot_SONAME="cygknot-15.dll"
;; #(
msys*) :
- libknot_SONAME="msys-knot-14.dll"
+ libknot_SONAME="msys-knot-15.dll"
;; #(
*) :
- libknot_SONAME="libknot.so.14"
+ libknot_SONAME="libknot.so.15"
;; #(
*) :
@@ -5267,17 +5263,9 @@ esac
KNOT_VERSION_MAJOR=3
-KNOT_VERSION_MINOR=3
+KNOT_VERSION_MINOR=4
-KNOT_VERSION_PATCH=9
-
-
-# Store ./configure parameters and CFLAGS
-
-printf "%s\n" "#define CONFIGURE_PARAMS \"$*\"" >>confdefs.h
-
-
-printf "%s\n" "#define CONFIGURE_CFLAGS \"$CFLAGS\"" >>confdefs.h
+KNOT_VERSION_PATCH=0
ac_config_files="$ac_config_files src/libknot/version.h src/libdnssec/version.h src/libzscanner/version.h"
@@ -15272,6 +15260,15 @@ else
HAVE_UTILS_FALSE=
fi
+ if test "$enable_utilities" != "no" -o \
+ "$enable_daemon" != "no"; then
+ HAVE_LIBUTILS_TRUE=
+ HAVE_LIBUTILS_FALSE='#'
+else
+ HAVE_LIBUTILS_TRUE='#'
+ HAVE_LIBUTILS_FALSE=
+fi
+
# Build Knot DNS documentation
# Check whether --enable-documentation was given.
@@ -15282,6 +15279,110 @@ else $as_nop
enable_documentation=yes
fi
+if test "$enable_documentation" = "yes"
+then :
+
+ # Extract the first word of "sphinx-build", so it can be a program name with args.
+set dummy sphinx-build; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_SPHINXBUILD+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ case $SPHINXBUILD in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_SPHINXBUILD="$SPHINXBUILD" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_path_SPHINXBUILD="$as_dir$ac_word$ac_exec_ext"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_SPHINXBUILD" && ac_cv_path_SPHINXBUILD="false"
+ ;;
+esac
+fi
+SPHINXBUILD=$ac_cv_path_SPHINXBUILD
+if test -n "$SPHINXBUILD"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SPHINXBUILD" >&5
+printf "%s\n" "$SPHINXBUILD" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+ if test "$SPHINXBUILD" = "false"
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: missing 'sphinx-build' executable for documentation generation" >&5
+printf "%s\n" "$as_me: WARNING: missing 'sphinx-build' executable for documentation generation" >&2;}
+ enable_documentation=no
+
+fi
+ # Extract the first word of "pdflatex", so it can be a program name with args.
+set dummy pdflatex; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_PDFLATEX+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ case $PDFLATEX in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PDFLATEX="$PDFLATEX" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_path_PDFLATEX="$as_dir$ac_word$ac_exec_ext"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_PDFLATEX" && ac_cv_path_PDFLATEX="false"
+ ;;
+esac
+fi
+PDFLATEX=$ac_cv_path_PDFLATEX
+if test -n "$PDFLATEX"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PDFLATEX" >&5
+printf "%s\n" "$PDFLATEX" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+
+fi
if test "$enable_documentation" = "yes"; then
HAVE_DOCS_TRUE=
HAVE_DOCS_FALSE='#'
@@ -15290,16 +15391,15 @@ else
HAVE_DOCS_FALSE=
fi
-
- if test "$enable_utilities" != "no" -o \
- "$enable_daemon" != "no"; then
- HAVE_LIBUTILS_TRUE=
- HAVE_LIBUTILS_FALSE='#'
+ if test "$PDFLATEX" != "false"; then
+ HAVE_PDFLATEX_TRUE=
+ HAVE_PDFLATEX_FALSE='#'
else
- HAVE_LIBUTILS_TRUE='#'
- HAVE_LIBUTILS_FALSE=
+ HAVE_PDFLATEX_TRUE='#'
+ HAVE_PDFLATEX_FALSE=
fi
+
######################
# Generic dependencies
######################
@@ -15410,19 +15510,19 @@ esac
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gnutls >= 3.3" >&5
-printf %s "checking for gnutls >= 3.3... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gnutls >= 3.6.10" >&5
+printf %s "checking for gnutls >= 3.6.10... " >&6; }
if test -n "$gnutls_CFLAGS"; then
pkg_cv_gnutls_CFLAGS="$gnutls_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 3.3\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gnutls >= 3.3") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 3.6.10\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gnutls >= 3.6.10") 2>&5
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_gnutls_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 3.3" 2>/dev/null`
+ pkg_cv_gnutls_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 3.6.10" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -15434,12 +15534,12 @@ if test -n "$gnutls_LIBS"; then
pkg_cv_gnutls_LIBS="$gnutls_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 3.3\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gnutls >= 3.3") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 3.6.10\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gnutls >= 3.6.10") 2>&5
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_gnutls_LIBS=`$PKG_CONFIG --libs "gnutls >= 3.3" 2>/dev/null`
+ pkg_cv_gnutls_LIBS=`$PKG_CONFIG --libs "gnutls >= 3.6.10" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -15460,14 +15560,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- gnutls_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= 3.3" 2>&1`
+ gnutls_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= 3.6.10" 2>&1`
else
- gnutls_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= 3.3" 2>&1`
+ gnutls_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= 3.6.10" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$gnutls_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (gnutls >= 3.3) were not met:
+ as_fn_error $? "Package requirements (gnutls >= 3.6.10) were not met:
$gnutls_PKG_ERRORS
@@ -15518,18 +15618,6 @@ printf "%s\n" "#define ENABLE_PKCS11 1" >>confdefs.h
fi
- ac_fn_check_decl "$LINENO" "GNUTLS_PK_EDDSA_ED25519" "ac_cv_have_decl_GNUTLS_PK_EDDSA_ED25519" "#include <gnutls/gnutls.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_GNUTLS_PK_EDDSA_ED25519" = xyes
-then :
-
-printf "%s\n" "#define HAVE_ED25519 1" >>confdefs.h
-
- enable_ed25519=yes
-else $as_nop
- enable_ed25519=no
-fi
-
ac_fn_check_decl "$LINENO" "GNUTLS_SIGN_EDDSA_ED448" "ac_cv_have_decl_GNUTLS_SIGN_EDDSA_ED448" "#include <gnutls/gnutls.h>
" "$ac_c_undeclared_builtin_options" "CFLAGS"
if test "x$ac_cv_have_decl_GNUTLS_SIGN_EDDSA_ED448" = xyes
@@ -15542,56 +15630,6 @@ else $as_nop
enable_ed448=no
fi
- ac_fn_check_decl "$LINENO" "GNUTLS_PRIVKEY_FLAG_REPRODUCIBLE" "ac_cv_have_decl_GNUTLS_PRIVKEY_FLAG_REPRODUCIBLE" "#include <gnutls/abstract.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_GNUTLS_PRIVKEY_FLAG_REPRODUCIBLE" = xyes
-then :
-
-printf "%s\n" "#define HAVE_GNUTLS_REPRODUCIBLE 1" >>confdefs.h
-
- # Ensure the version is at least 3.6.10
- ac_fn_c_check_func "$LINENO" "gnutls_aead_cipher_encryptv2" "ac_cv_func_gnutls_aead_cipher_encryptv2"
-if test "x$ac_cv_func_gnutls_aead_cipher_encryptv2" = xyes
-then :
- enable_repro_signing=yes
-else $as_nop
- enable_repro_signing=no
-fi
-
-else $as_nop
- enable_repro_signing=no
-fi
-
- ac_fn_c_check_func "$LINENO" "gnutls_privkey_sign_data2" "ac_cv_func_gnutls_privkey_sign_data2"
-if test "x$ac_cv_func_gnutls_privkey_sign_data2" = xyes
-then :
-
-printf "%s\n" "#define HAVE_SIGN_DATA2 1" >>confdefs.h
-
-fi
-
-
- ac_fn_c_check_func "$LINENO" "gnutls_privkey_export_x509" "ac_cv_func_gnutls_privkey_export_x509"
-if test "x$ac_cv_func_gnutls_privkey_export_x509" = xyes
-then :
-
-printf "%s\n" "#define HAVE_EXPORT_X509 1" >>confdefs.h
-
-fi
-
-
- ac_fn_c_check_func "$LINENO" "gnutls_memset" "ac_cv_func_gnutls_memset"
-if test "x$ac_cv_func_gnutls_memset" = xyes
-then :
-
-printf "%s\n" "#define HAVE_GNUTLS_MEMSET 1" >>confdefs.h
-
- gnutls_memset=yes
-else $as_nop
- gnutls_memset=no
-fi
-
-
ac_fn_c_check_func "$LINENO" "gnutls_early_cipher_get" "ac_cv_func_gnutls_early_cipher_get"
if test "x$ac_cv_func_gnutls_early_cipher_get" = xyes
then :
@@ -15972,6 +16010,15 @@ else $as_nop
fi
+# Check whether --enable-dbus was given.
+if test ${enable_dbus+y}
+then :
+ enableval=$enable_dbus; enable_dbus="$enableval"
+else $as_nop
+ enable_dbus=auto
+fi
+
+
if test "$enable_daemon" = "yes"
then :
@@ -16462,16 +16509,187 @@ then :
printf "%s\n" "#define ENABLE_SYSTEMD 1" >>confdefs.h
- ac_fn_c_check_header_compile "$LINENO" "systemd/sd-bus.h" "ac_cv_header_systemd_sd_bus_h" "$ac_includes_default"
-if test "x$ac_cv_header_systemd_sd_bus_h" = xyes
+fi
+
+if test "$enable_dbus" != "no"
+then :
+
+ case $enable_dbus in #(
+ auto) :
+ if test "$enable_systemd" = "yes"
+then :
+
+printf "%s\n" "#define ENABLE_DBUS_SYSTEMD 1" >>confdefs.h
+
+ enable_dbus=systemd
+else $as_nop
+
+pkg_failed=no
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dbus-1" >&5
+printf %s "checking for dbus-1... " >&6; }
+
+if test -n "$libdbus_CFLAGS"; then
+ pkg_cv_libdbus_CFLAGS="$libdbus_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_libdbus_CFLAGS=`$PKG_CONFIG --cflags "dbus-1" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$libdbus_LIBS"; then
+ pkg_cv_libdbus_LIBS="$libdbus_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_libdbus_LIBS=`$PKG_CONFIG --libs "dbus-1" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ libdbus_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1" 2>&1`
+ else
+ libdbus_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$libdbus_PKG_ERRORS" >&5
+
+ enable_dbus=no
+elif test $pkg_failed = untried; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ enable_dbus=no
+else
+ libdbus_CFLAGS=$pkg_cv_libdbus_CFLAGS
+ libdbus_LIBS=$pkg_cv_libdbus_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+printf "%s\n" "#define ENABLE_DBUS_LIBDBUS 1" >>confdefs.h
+
+ enable_dbus=libdbus
+fi
+fi ;; #(
+ systemd) :
+ if test "$enable_systemd" = "yes"
then :
-printf "%s\n" "#define ENABLE_DBUS 1" >>confdefs.h
+printf "%s\n" "#define ENABLE_DBUS_SYSTEMD 1" >>confdefs.h
+ enable_dbus=systemd
else $as_nop
- enable_systemd="yes (without D-Bus)"
+ as_fn_error $? "systemd >= 221 not available." "$LINENO" 5
+fi ;; #(
+ libdbus) :
+
+pkg_failed=no
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dbus-1" >&5
+printf %s "checking for dbus-1... " >&6; }
+
+if test -n "$libdbus_CFLAGS"; then
+ pkg_cv_libdbus_CFLAGS="$libdbus_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_libdbus_CFLAGS=`$PKG_CONFIG --cflags "dbus-1" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$libdbus_LIBS"; then
+ pkg_cv_libdbus_LIBS="$libdbus_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_libdbus_LIBS=`$PKG_CONFIG --libs "dbus-1" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
fi
+ if test $_pkg_short_errors_supported = yes; then
+ libdbus_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1" 2>&1`
+ else
+ libdbus_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$libdbus_PKG_ERRORS" >&5
+
+ as_fn_error $? "libdbus not available." "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ as_fn_error $? "libdbus not available." "$LINENO" 5
+else
+ libdbus_CFLAGS=$pkg_cv_libdbus_CFLAGS
+ libdbus_LIBS=$pkg_cv_libdbus_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+printf "%s\n" "#define ENABLE_DBUS_LIBDBUS 1" >>confdefs.h
+
+ enable_dbus=libdbus
+fi ;; #(
+ no) :
+ enable_dbus=no ;; #(
+ *) :
+ as_fn_error $? "Invalid value of --enable-dbus." "$LINENO" 5 ;; #(
+ *) :
+ ;;
+esac
fi
@@ -16666,21 +16884,10 @@ then :
fi
-
-# Check whether --with-urcu was given.
-if test ${with_urcu+y}
-then :
- withval=$with_urcu;
-fi
-
-
if test "$enable_daemon" = "yes"
then :
-if test "$with_urcu" != "no"
-then :
-
pkg_failed=no
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for liburcu" >&5
@@ -16741,217 +16948,13 @@ fi
echo "$liburcu_PKG_ERRORS" >&5
- for try_urcu in "$with_urcu" "" "/usr/local"; do
- save_LIBS="$LIBS"
- save_CPPFLAGS="$CPPFLAGS"
-
- if test -d "$try_urcu"
-then :
-
- liburcu_CFLAGS="-I$try_urcu/include"
- liburcu_LIBS="-L$try_urcu/lib"
-
-else $as_nop
-
- liburcu_CFLAGS=""
- liburcu_LIBS=""
-
-fi
-
- CPPFLAGS="$CPPFLAGS $liburcu_CFLAGS"
- LIBS="$LIBS $liburcu_LIBS"
-
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing rcu_set_pointer_sym" >&5
-printf %s "checking for library containing rcu_set_pointer_sym... " >&6; }
-if test ${ac_cv_search_rcu_set_pointer_sym+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char rcu_set_pointer_sym ();
-int
-main (void)
-{
-return rcu_set_pointer_sym ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' urcu
-do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"
-then :
- ac_cv_search_rcu_set_pointer_sym=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext
- if test ${ac_cv_search_rcu_set_pointer_sym+y}
-then :
- break
-fi
-done
-if test ${ac_cv_search_rcu_set_pointer_sym+y}
-then :
-
-else $as_nop
- ac_cv_search_rcu_set_pointer_sym=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_rcu_set_pointer_sym" >&5
-printf "%s\n" "$ac_cv_search_rcu_set_pointer_sym" >&6; }
-ac_res=$ac_cv_search_rcu_set_pointer_sym
-if test "$ac_res" != no
-then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
- with_urcu=yes
- liburcu_LIBS="$liburcu_LIBS -lurcu"
-
-
- break
-
-else $as_nop
-
- CPPFLAGS="$save_CPPFLAGS"
- LIBS="$save_LIBS"
- with_urcu=no
- # do not cache result of AC_SEARCH_LIBS test
- unset ac_cv_search_rcu_set_pointer_sym
-
-fi
-
- done
- CPPFLAGS="$save_CPPFLAGS"
- LIBS="$save_LIBS"
-
- if test "$with_urcu" = "no"
-then :
-
- as_fn_error $? "liburcu is required" "$LINENO" 5
-
-fi
+ as_fn_error $? "liburcu not found" "$LINENO" 5
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- for try_urcu in "$with_urcu" "" "/usr/local"; do
- save_LIBS="$LIBS"
- save_CPPFLAGS="$CPPFLAGS"
-
- if test -d "$try_urcu"
-then :
-
- liburcu_CFLAGS="-I$try_urcu/include"
- liburcu_LIBS="-L$try_urcu/lib"
-
-else $as_nop
-
- liburcu_CFLAGS=""
- liburcu_LIBS=""
-
-fi
-
- CPPFLAGS="$CPPFLAGS $liburcu_CFLAGS"
- LIBS="$LIBS $liburcu_LIBS"
-
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing rcu_set_pointer_sym" >&5
-printf %s "checking for library containing rcu_set_pointer_sym... " >&6; }
-if test ${ac_cv_search_rcu_set_pointer_sym+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char rcu_set_pointer_sym ();
-int
-main (void)
-{
-return rcu_set_pointer_sym ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' urcu
-do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"
-then :
- ac_cv_search_rcu_set_pointer_sym=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext
- if test ${ac_cv_search_rcu_set_pointer_sym+y}
-then :
- break
-fi
-done
-if test ${ac_cv_search_rcu_set_pointer_sym+y}
-then :
-
-else $as_nop
- ac_cv_search_rcu_set_pointer_sym=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_rcu_set_pointer_sym" >&5
-printf "%s\n" "$ac_cv_search_rcu_set_pointer_sym" >&6; }
-ac_res=$ac_cv_search_rcu_set_pointer_sym
-if test "$ac_res" != no
-then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
- with_urcu=yes
- liburcu_LIBS="$liburcu_LIBS -lurcu"
-
-
- break
-
-else $as_nop
-
- CPPFLAGS="$save_CPPFLAGS"
- LIBS="$save_LIBS"
- with_urcu=no
- # do not cache result of AC_SEARCH_LIBS test
- unset ac_cv_search_rcu_set_pointer_sym
-
-fi
-
- done
- CPPFLAGS="$save_CPPFLAGS"
- LIBS="$save_LIBS"
-
- if test "$with_urcu" = "no"
-then :
-
- as_fn_error $? "liburcu is required" "$LINENO" 5
-
-fi
+ as_fn_error $? "liburcu not found" "$LINENO" 5
else
liburcu_CFLAGS=$pkg_cv_liburcu_CFLAGS
@@ -16959,12 +16962,6 @@ else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- liburcu_PKGCONFIG="liburcu >= 0.4.0"
-
- with_urcu=yes
-
-fi
-
fi
@@ -19226,185 +19223,17 @@ fi
echo "$libidn2_PKG_ERRORS" >&5
-
-pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libidn >= 0.0.0" >&5
-printf %s "checking for libidn >= 0.0.0... " >&6; }
-
-if test -n "$libidn_CFLAGS"; then
- pkg_cv_libidn_CFLAGS="$libidn_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn >= 0.0.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libidn >= 0.0.0") 2>&5
- ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_libidn_CFLAGS=`$PKG_CONFIG --cflags "libidn >= 0.0.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$libidn_LIBS"; then
- pkg_cv_libidn_LIBS="$libidn_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn >= 0.0.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libidn >= 0.0.0") 2>&5
- ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_libidn_LIBS=`$PKG_CONFIG --libs "libidn >= 0.0.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- libidn_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libidn >= 0.0.0" 2>&1`
- else
- libidn_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libidn >= 0.0.0" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$libidn_PKG_ERRORS" >&5
-
-
- with_libidn=no
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libidn2 or libidn not found" >&5
-printf "%s\n" "$as_me: WARNING: libidn2 or libidn not found" >&2;}
-
-elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-
- with_libidn=no
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libidn2 or libidn not found" >&5
-printf "%s\n" "$as_me: WARNING: libidn2 or libidn not found" >&2;}
-
-else
- libidn_CFLAGS=$pkg_cv_libidn_CFLAGS
- libidn_LIBS=$pkg_cv_libidn_LIBS
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-
- with_libidn=libidn
-
-printf "%s\n" "#define LIBIDN 1" >>confdefs.h
-
-
-printf "%s\n" "#define LIBIDN_HEADER <idna.h>" >>confdefs.h
-
-
-fi
-
-elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-
-
-pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libidn >= 0.0.0" >&5
-printf %s "checking for libidn >= 0.0.0... " >&6; }
-
-if test -n "$libidn_CFLAGS"; then
- pkg_cv_libidn_CFLAGS="$libidn_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn >= 0.0.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libidn >= 0.0.0") 2>&5
- ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_libidn_CFLAGS=`$PKG_CONFIG --cflags "libidn >= 0.0.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$libidn_LIBS"; then
- pkg_cv_libidn_LIBS="$libidn_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn >= 0.0.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libidn >= 0.0.0") 2>&5
- ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_libidn_LIBS=`$PKG_CONFIG --libs "libidn >= 0.0.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- libidn_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libidn >= 0.0.0" 2>&1`
- else
- libidn_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libidn >= 0.0.0" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$libidn_PKG_ERRORS" >&5
-
-
- with_libidn=no
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libidn2 or libidn not found" >&5
-printf "%s\n" "$as_me: WARNING: libidn2 or libidn not found" >&2;}
+ with_libidn=no
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libidn2 not found" >&5
+printf "%s\n" "$as_me: WARNING: libidn2 not found" >&2;}
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- with_libidn=no
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libidn2 or libidn not found" >&5
-printf "%s\n" "$as_me: WARNING: libidn2 or libidn not found" >&2;}
-
-else
- libidn_CFLAGS=$pkg_cv_libidn_CFLAGS
- libidn_LIBS=$pkg_cv_libidn_LIBS
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-
- with_libidn=libidn
-
-printf "%s\n" "#define LIBIDN 1" >>confdefs.h
-
-
-printf "%s\n" "#define LIBIDN_HEADER <idna.h>" >>confdefs.h
-
-
-fi
+ with_libidn=no
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libidn2 not found" >&5
+printf "%s\n" "$as_me: WARNING: libidn2 not found" >&2;}
else
libidn2_CFLAGS=$pkg_cv_libidn2_CFLAGS
@@ -19417,9 +19246,6 @@ printf "%s\n" "yes" >&6; }
printf "%s\n" "#define LIBIDN 1" >>confdefs.h
-printf "%s\n" "#define LIBIDN_HEADER <idn2.h>" >>confdefs.h
-
-
fi
fi
@@ -20245,7 +20071,6 @@ fi
-
# Checks for optional library functions.
ac_fn_c_check_func "$LINENO" "accept4" "ac_cv_func_accept4"
if test "x$ac_cv_func_accept4" = xyes
@@ -20330,7 +20155,7 @@ else $as_nop
fi
- if test "$explicit_bzero" = "no" -a "$explicit_memset" = "no" -a "$gnutls_memset" = "yes"; then
+ if test "$explicit_bzero" = "no" -a "$explicit_memset" = "no"; then
USE_GNUTLS_MEMSET_TRUE=
USE_GNUTLS_MEMSET_FALSE='#'
else
@@ -20409,14 +20234,19 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
-# Check for '__atomic' compiler builtin atomic functions.
+# Check for a C11 or GCC-style '__atomic' compiler builtin atomic functions.
+atomic_type="none"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <stdint.h>
+#if (__STDC_VERSION__ < 201112L) || defined(__STDC_NO_ATOMICS__)
+ #error "No C11 atomics"
+ #endif
+ #include <stdatomic.h>
int
main (void)
{
-uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);
+atomic_uint_fast64_t val = 0;
+ atomic_fetch_add_explicit(&val, 1, memory_order_relaxed);
;
return 0;
}
@@ -20424,21 +20254,17 @@ _ACEOF
if ac_fn_c_try_link "$LINENO"
then :
-printf "%s\n" "#define HAVE_ATOMIC 1" >>confdefs.h
-
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext conftest.$ac_ext
+printf "%s\n" "#define HAVE_C11_ATOMIC 1" >>confdefs.h
-# Check for '__sync' compiler builtin atomic functions.
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ atomic_type="C11"
+else $as_nop
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdint.h>
int
main (void)
{
-int val = 0; __sync_add_and_fetch(&val, 1);
+uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);
;
return 0;
}
@@ -20446,8 +20272,13 @@ _ACEOF
if ac_fn_c_try_link "$LINENO"
then :
-printf "%s\n" "#define HAVE_SYNC_ATOMIC 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GCC_ATOMIC 1" >>confdefs.h
+
+ atomic_type="__atomic"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -20799,191 +20630,15 @@ else
fi
-if test "$enable_documentation" = "yes"
-then :
-
-
-# Extract the first word of "sphinx-build", so it can be a program name with args.
-set dummy sphinx-build; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_SPHINXBUILD+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- case $SPHINXBUILD in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_SPHINXBUILD="$SPHINXBUILD" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_path_SPHINXBUILD="$as_dir$ac_word$ac_exec_ext"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_SPHINXBUILD" && ac_cv_path_SPHINXBUILD="false"
- ;;
-esac
-fi
-SPHINXBUILD=$ac_cv_path_SPHINXBUILD
-if test -n "$SPHINXBUILD"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SPHINXBUILD" >&5
-printf "%s\n" "$SPHINXBUILD" >&6; }
-else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-if test "$SPHINXBUILD" = "false"
-then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: missing 'sphinx-build' executable for documentation generation" >&5
-printf "%s\n" "$as_me: WARNING: missing 'sphinx-build' executable for documentation generation" >&2;}
-
-fi
-# Extract the first word of "pdflatex", so it can be a program name with args.
-set dummy pdflatex; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_PDFLATEX+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- case $PDFLATEX in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PDFLATEX="$PDFLATEX" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_path_PDFLATEX="$as_dir$ac_word$ac_exec_ext"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_PDFLATEX" && ac_cv_path_PDFLATEX="false"
- ;;
-esac
-fi
-PDFLATEX=$ac_cv_path_PDFLATEX
-if test -n "$PDFLATEX"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PDFLATEX" >&5
-printf "%s\n" "$PDFLATEX" >&6; }
-else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-# Extract the first word of "makeinfo", so it can be a program name with args.
-set dummy makeinfo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_MAKEINFO+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- case $MAKEINFO in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_MAKEINFO="$MAKEINFO" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_path_MAKEINFO="$as_dir$ac_word$ac_exec_ext"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_MAKEINFO" && ac_cv_path_MAKEINFO="false"
- ;;
-esac
-fi
-MAKEINFO=$ac_cv_path_MAKEINFO
-if test -n "$MAKEINFO"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAKEINFO" >&5
-printf "%s\n" "$MAKEINFO" >&6; }
-else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-
-
-fi
-
- if test "$SPHINXBUILD" != "false"; then
- HAVE_SPHINXBUILD_TRUE=
- HAVE_SPHINXBUILD_FALSE='#'
-else
- HAVE_SPHINXBUILD_TRUE='#'
- HAVE_SPHINXBUILD_FALSE=
-fi
-
- if test "$PDFLATEX" != "false"; then
- HAVE_PDFLATEX_TRUE=
- HAVE_PDFLATEX_FALSE='#'
-else
- HAVE_PDFLATEX_TRUE='#'
- HAVE_PDFLATEX_FALSE=
-fi
-
- if test "$MAKEINFO" != "false"; then
- HAVE_MAKEINFO_TRUE=
- HAVE_MAKEINFO_FALSE='#'
-else
- HAVE_MAKEINFO_TRUE='#'
- HAVE_MAKEINFO_FALSE=
-fi
-
-
# Strip -fdebug-prefix-map= parameters from flags for better reproducibility of binaries.
filtered_cflags=$(echo -n "$CFLAGS" | \
sed 's/[^[:alnum:]]-f[^[:space:]]*-prefix-map=[^[:space:]]*//g')
filtered_cppflags=$(echo -n "$CPPFLAGS" | \
sed 's/[^[:alnum:]]-f[^[:space:]]*-prefix-map=[^[:space:]]*//g')
+filtered_config_params=$(echo -n "$ac_configure_args" | \
+ sed 's/[^[:alnum:]]-f[^[:space:]]*-prefix-map=[^[:space:]]*//g')
-result_msg_base=" Knot DNS $VERSION
-
+result_msg_base="
Target: $host_os $host_cpu $endianity
Compiler: ${CC}
CFLAGS: ${filtered_cflags} ${filtered_cppflags}
@@ -21013,6 +20668,7 @@ result_msg_base=" Knot DNS $VERSION
XDP support: ${enable_xdp}
DoQ support: ${enable_quic}
Socket polling: ${socket_polling}
+ Atomic support: ${atomic_type}
Memory allocator: ${with_memory_allocator}
Fast zone parser: ${enable_fastparser}
Utilities with IDN: ${with_libidn}
@@ -21020,17 +20676,17 @@ result_msg_base=" Knot DNS $VERSION
Utilities with Dnstap: ${enable_dnstap}
MaxMind DB support: ${enable_maxminddb}
Systemd integration: ${enable_systemd}
+ D-Bus support: ${enable_dbus}
POSIX capabilities: ${enable_cap_ng}
PKCS #11 support: ${enable_pkcs11}
- Ed25519 support: ${enable_ed25519}
Ed448 support: ${enable_ed448}
- Reproducible signing: ${enable_repro_signing}
+
Code coverage: ${enable_code_coverage}
Sanitizer: ${with_sanitizer}
LibFuzzer: ${with_fuzzer}
OSS-Fuzz: ${with_oss_fuzz}"
-result_msg_esc=$(echo -n "$result_msg_base" | sed '$!s/$/\\n/' | tr -d '\n')
+result_msg_esc=$(echo -n " Configure:$filtered_config_params\n$result_msg_base" | sed '$!s/$/\\n/' | tr -d '\n')
printf "%s\n" "#define CONFIGURE_SUMMARY \"$result_msg_esc\"" >>confdefs.h
@@ -21188,12 +20844,16 @@ if test -z "${HAVE_UTILS_TRUE}" && test -z "${HAVE_UTILS_FALSE}"; then
as_fn_error $? "conditional \"HAVE_UTILS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${HAVE_LIBUTILS_TRUE}" && test -z "${HAVE_LIBUTILS_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_LIBUTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${HAVE_DOCS_TRUE}" && test -z "${HAVE_DOCS_FALSE}"; then
as_fn_error $? "conditional \"HAVE_DOCS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${HAVE_LIBUTILS_TRUE}" && test -z "${HAVE_LIBUTILS_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_LIBUTILS\" was never defined.
+if test -z "${HAVE_PDFLATEX_TRUE}" && test -z "${HAVE_PDFLATEX_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_PDFLATEX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${FAST_PARSER_TRUE}" && test -z "${FAST_PARSER_FALSE}"; then
@@ -21348,18 +21008,6 @@ if test -z "${OSS_FUZZ_TRUE}" && test -z "${OSS_FUZZ_FALSE}"; then
as_fn_error $? "conditional \"OSS_FUZZ\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${HAVE_SPHINXBUILD_TRUE}" && test -z "${HAVE_SPHINXBUILD_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_SPHINXBUILD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_PDFLATEX_TRUE}" && test -z "${HAVE_PDFLATEX_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_PDFLATEX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_MAKEINFO_TRUE}" && test -z "${HAVE_MAKEINFO_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_MAKEINFO\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
@@ -21750,7 +21398,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by knot $as_me 3.3.9, which was
+This file was extended by knot $as_me 3.4.0, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21818,7 +21466,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-knot config.status 3.3.9
+knot config.status 3.4.0
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
@@ -23543,9 +23191,11 @@ printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
+ Knot DNS $VERSION
$result_msg_base
" >&5
printf "%s\n" "
+ Knot DNS $VERSION
$result_msg_base
" >&6; }
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-08 08:56:36 +0000