From bbae86d3d2997a853ca0365e8eb7a3ca7489ee09 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 25 Jan 2019 11:24:41 +0100 Subject: New upstream version 1.15.2 --- configure | 137 ++++++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 97 insertions(+), 40 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 59fcebd8..15bfa85a 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.69 for NetworkManager 1.14.4. +# Generated by GNU Autoconf 2.69 for NetworkManager 1.15.2. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='1.14.4' -PACKAGE_STRING='NetworkManager 1.14.4' +PACKAGE_VERSION='1.15.2' +PACKAGE_STRING='NetworkManager 1.15.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -637,6 +637,7 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +AM_CFLAGS HAVE_DOCS_FALSE HAVE_DOCS_TRUE BUILD_DOCS_FALSE @@ -771,6 +772,8 @@ LIBAUDIT_LIBS LIBAUDIT_CFLAGS SELINUX_LIBS SELINUX_CFLAGS +WITH_EBPF_FALSE +WITH_EBPF_TRUE ELOGIND_INHIBIT_LIBS ELOGIND_INHIBIT_CFLAGS SYSTEMD_INHIBIT_LIBS @@ -1069,6 +1072,7 @@ with_systemd_logind with_consolekit with_session_tracking with_suspend_resume +with_ebpf with_selinux with_libaudit enable_teamdctl @@ -1727,7 +1731,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 NetworkManager 1.14.4 to adapt to many kinds of systems. +\`configure' configures NetworkManager 1.15.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1797,7 +1801,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 1.14.4:";; + short | recursive ) echo "Configuration of NetworkManager 1.15.2:";; esac cat <<\_ACEOF @@ -1840,7 +1844,7 @@ Optional Features: --enable-modify-system Allow users to modify system connections --enable-ppp enable PPP/PPPoE support --enable-bluez5-dun enable Bluez5 DUN support - --enable-ovs enable OpenVSwitch support + --enable-ovs enable Open vSwitch support --enable-concheck enable connectivity checking support --enable-more-warnings Possible values: no/yes/error --enable-more-asserts Enable more assertions for debugging (default: @@ -1908,6 +1912,7 @@ Optional Packages: --with-suspend-resume=upower|systemd|elogind|consolekit Build NetworkManager with specific suspend/resume support + --with-ebpf=yes|no|auto Build with eBPF support (default: auto) --with-selinux=yes|no|auto Build with SELinux (default: auto) --with-libaudit=yes|yes-disabled-by-default|no|auto @@ -2136,7 +2141,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 1.14.4 +NetworkManager configure 1.15.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2909,7 +2914,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 NetworkManager $as_me 1.14.4, which was +It was created by NetworkManager $as_me 1.15.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3779,7 +3784,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='1.14.4' + VERSION='1.15.2' cat >>confdefs.h <<_ACEOF @@ -17962,9 +17967,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=1 -NM_MINOR_VERSION=14 -NM_MICRO_VERSION=4 -NM_VERSION=1.14.4 +NM_MINOR_VERSION=15 +NM_MICRO_VERSION=2 +NM_VERSION=1.15.2 @@ -17972,7 +17977,7 @@ NM_VERSION=1.14.4 -NM_GIT_SHA=66cad942f2404a5bac0df1a623fb5d72ab8f4d20 +NM_GIT_SHA=862721d269418854ab55a77bc91c5299a214bc9b if test """" != "no-config-h" ; then @@ -18124,6 +18129,21 @@ cat >>confdefs.h <<_ACEOF _ACEOF +ac_fn_c_check_decl "$LINENO" "memfd_create" "ac_cv_have_decl_memfd_create" " +#include + +" +if test "x$ac_cv_have_decl_memfd_create" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_MEMFD_CREATE $ac_have_decl +_ACEOF + + for ac_header in sys/auxv.h do : ac_fn_c_check_header_mongrel "$LINENO" "sys/auxv.h" "ac_cv_header_sys_auxv_h" "$ac_includes_default" @@ -23654,6 +23674,39 @@ $as_echo "#define SUSPEND_RESUME_CONSOLEKIT 1" >>confdefs.h ;; esac +# eBPF support + +# Check whether --with-ebpf was given. +if test "${with_ebpf+set}" = set; then : + withval=$with_ebpf; +else + with_ebpf=auto +fi + +if test "$with_ebpf" = "yes" -o "$with_ebpf" = "auto"; then + ac_fn_c_check_header_mongrel "$LINENO" "linux/bpf.h" "ac_cv_header_linux_bpf_h" "$ac_includes_default" +if test "x$ac_cv_header_linux_bpf_h" = xyes; then : + have_ebpf=yes +else + have_ebpf=no +fi + + +else + have_ebpf=no +fi +if test "$with_ebpf" = "yes" -a "$have_ebpf" = "no"; then + as_fn_error $? "--with-ebpf=yes requires eBPF kernel header" "$LINENO" 5 +fi + if test "${have_ebpf}" = "yes"; then + WITH_EBPF_TRUE= + WITH_EBPF_FALSE='#' +else + WITH_EBPF_TRUE='#' + WITH_EBPF_FALSE= +fi + + # SELinux support # Check whether --with-selinux was given. @@ -24294,7 +24347,7 @@ fi # we usually compile with polkit support. --enable-polkit=yes|no only sets the # default configuration for main.auth-polkit. User can always enable/disable polkit -# autorization via config. +# authorization via config. # Check whether --enable-polkit was given. if test "${enable_polkit+set}" = set; then : enableval=$enable_polkit; enable_polkit=${enableval} @@ -25070,7 +25123,7 @@ $as_echo "#define WITH_DHCPCANON 0" >>confdefs.h fi -# OpenVSwitch integration +# Open vSwitch integration # Check whether --enable-ovs was given. if test "${enable_ovs+set}" = set; then : enableval=$enable_ovs; @@ -26264,18 +26317,16 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then $as_echo "yes" >&6; } CFLAGS_SAVED="$CFLAGS" - eval "CFLAGS='$CFLAGS -Qunused-arguments'" + CFLAGS="$CFLAGS -Qunused-arguments" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - -else - eval "CFLAGS='$CFLAGS_SAVED'" + eval "AM_CFLAGS='$AM_CFLAGS -Qunused-arguments'" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - unset CFLAGS_SAVED + CFLAGS="$CFLAGS_SAVED" @@ -26299,14 +26350,14 @@ if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } CFLAGS="$CFLAGS_SAVED" - eval "CFLAGS='$CFLAGS -Wunknown-warning-option'" + eval "AM_CFLAGS='$AM_CFLAGS -Wunknown-warning-option'" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } CFLAGS="$CFLAGS_SAVED" - eval "CFLAGS='$CFLAGS -Wno-unknown-warning-option'" + eval "AM_CFLAGS='$AM_CFLAGS -Wno-unknown-warning-option'" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -26423,14 +26474,14 @@ if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } CFLAGS="$CFLAGS_SAVED" - eval "CFLAGS='$CFLAGS -Wunknown-attributes'" + eval "AM_CFLAGS='$AM_CFLAGS -Wunknown-attributes'" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } CFLAGS="$CFLAGS_SAVED" - eval "CFLAGS='$CFLAGS -Wno-unknown-attributes'" + eval "AM_CFLAGS='$AM_CFLAGS -Wno-unknown-attributes'" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -26468,14 +26519,14 @@ if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } CFLAGS="$CFLAGS_SAVED" - eval "CFLAGS='$CFLAGS -Wtypedef-redefinition'" + eval "AM_CFLAGS='$AM_CFLAGS -Wtypedef-redefinition'" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } CFLAGS="$CFLAGS_SAVED" - eval "CFLAGS='$CFLAGS -Wno-typedef-redefinition'" + eval "AM_CFLAGS='$AM_CFLAGS -Wno-typedef-redefinition'" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -26515,14 +26566,14 @@ if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } CFLAGS="$CFLAGS_SAVED" - eval "CFLAGS='$CFLAGS -Warray-bounds'" + eval "AM_CFLAGS='$AM_CFLAGS -Warray-bounds'" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } CFLAGS="$CFLAGS_SAVED" - eval "CFLAGS='$CFLAGS -Wno-array-bounds'" + eval "AM_CFLAGS='$AM_CFLAGS -Wno-array-bounds'" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -26562,14 +26613,14 @@ if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } CFLAGS="$CFLAGS_SAVED" - eval "CFLAGS='$CFLAGS -Wparentheses-equality'" + eval "AM_CFLAGS='$AM_CFLAGS -Wparentheses-equality'" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } CFLAGS="$CFLAGS_SAVED" - eval "CFLAGS='$CFLAGS -Wno-parentheses-equality'" + eval "AM_CFLAGS='$AM_CFLAGS -Wno-parentheses-equality'" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -26609,14 +26660,14 @@ if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } CFLAGS="$CFLAGS_SAVED" - eval "CFLAGS='$CFLAGS -Wunused-value'" + eval "AM_CFLAGS='$AM_CFLAGS -Wunused-value'" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } CFLAGS="$CFLAGS_SAVED" - eval "CFLAGS='$CFLAGS -Wno-unused-value'" + eval "AM_CFLAGS='$AM_CFLAGS -Wno-unused-value'" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -26655,14 +26706,14 @@ if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } CFLAGS="$CFLAGS_SAVED" - eval "CFLAGS='$CFLAGS -Wmissing-braces'" + eval "AM_CFLAGS='$AM_CFLAGS -Wmissing-braces'" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } CFLAGS="$CFLAGS_SAVED" - eval "CFLAGS='$CFLAGS -Wno-missing-braces'" + eval "AM_CFLAGS='$AM_CFLAGS -Wno-missing-braces'" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -26706,14 +26757,14 @@ if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } CFLAGS="$CFLAGS_SAVED" - eval "CFLAGS='$CFLAGS -Wcast-function-type'" + eval "AM_CFLAGS='$AM_CFLAGS -Wcast-function-type'" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } CFLAGS="$CFLAGS_SAVED" - eval "CFLAGS='$CFLAGS -Wno-cast-function-type'" + eval "AM_CFLAGS='$AM_CFLAGS -Wno-cast-function-type'" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -26729,7 +26780,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - eval "CFLAGS='$CFLAGS_MORE_WARNINGS $CFLAGS'" + eval "AM_CFLAGS='$CFLAGS_MORE_WARNINGS $AM_CFLAGS'" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -26820,7 +26871,7 @@ fi done -CFLAGS="$CFLAGS $with_cflags" +AM_CFLAGS="$AM_CFLAGS $with_cflags" # Check whether --enable-more-asserts was given. if test "${enable_more_asserts+set}" = set; then : @@ -28217,6 +28268,7 @@ else fi + ac_config_files="$ac_config_files Makefile shared/nm-version-macros.h libnm/libnm.pc libnm-util/libnm-util.pc libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc po/Makefile.in data/org.freedesktop.NetworkManager.policy.in docs/api/Makefile docs/api/version.xml docs/libnm-glib/Makefile docs/libnm-glib/version.xml docs/libnm-util/Makefile docs/libnm-util/version.xml docs/libnm/Makefile docs/libnm/version.xml NetworkManager.pc" cat >confcache <<\_ACEOF @@ -28424,6 +28476,10 @@ if test -z "${HAVE_SYSTEMD_200_TRUE}" && test -z "${HAVE_SYSTEMD_200_FALSE}"; th as_fn_error $? "conditional \"HAVE_SYSTEMD_200\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${WITH_EBPF_TRUE}" && test -z "${WITH_EBPF_FALSE}"; then + as_fn_error $? "conditional \"WITH_EBPF\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${WITH_JANSSON_TRUE}" && test -z "${WITH_JANSSON_FALSE}"; then as_fn_error $? "conditional \"WITH_JANSSON\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -28929,7 +28985,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 NetworkManager $as_me 1.14.4, which was +This file was extended by NetworkManager $as_me 1.15.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -28995,7 +29051,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -NetworkManager config.status 1.14.4 +NetworkManager config.status 1.15.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -31189,4 +31245,5 @@ echo " JSON validation for libnm: $enable_json_validation" echo " crypto: $with_crypto (have-gnutls: $have_crypto_gnutls, have-nss: $have_crypto_nss)" echo " sanitizers: $sanitizers" echo " Mozilla Public Suffix List: $with_libpsl" +echo " eBPF: $have_ebpf" echo -- cgit 1.3.0-6-gf8a5