From 964ae8cc391520440cf5aa13e2b9cc34850ea6c2 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Feb 2019 19:01:41 +0100 Subject: New upstream version 1.14.6 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index f101594f..1f9dcb3c 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ dnl "shared/nm-version-macros.h.in" dnl - update number in meson.build m4_define([nm_major_version], [1]) m4_define([nm_minor_version], [14]) -m4_define([nm_micro_version], [4]) +m4_define([nm_micro_version], [6]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) -- cgit 1.3.0-6-gf8a5 From 9a6dcbf895f9da01768e64b73cec88c16157d91e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Mar 2019 23:25:23 +0100 Subject: New upstream version 1.16.0 --- configure.ac | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 1f9dcb3c..967eac03 100644 --- a/configure.ac +++ b/configure.ac @@ -7,8 +7,8 @@ dnl - add corresponding NM_VERSION_x_y_z macros in dnl "shared/nm-version-macros.h.in" dnl - update number in meson.build m4_define([nm_major_version], [1]) -m4_define([nm_minor_version], [14]) -m4_define([nm_micro_version], [6]) +m4_define([nm_minor_version], [16]) +m4_define([nm_micro_version], [0]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) @@ -81,6 +81,12 @@ AC_CHECK_DECLS([ #include ]]) +AC_CHECK_DECLS([ + memfd_create], + [], [], [[ +#include +]]) + AC_CHECK_HEADERS(sys/auxv.h) AC_CHECK_DECLS([getrandom], @@ -518,6 +524,20 @@ case $with_suspend_resume in ;; esac +# eBPF support +AC_ARG_WITH(ebpf, + AS_HELP_STRING([--with-ebpf=yes|no|auto], [Build with eBPF support (default: auto)]), + [], [with_ebpf=auto]) +if test "$with_ebpf" = "yes" -o "$with_ebpf" = "auto"; then + AC_CHECK_HEADER(linux/bpf.h, [have_ebpf=yes], [have_ebpf=no]) +else + have_ebpf=no +fi +if test "$with_ebpf" = "yes" -a "$have_ebpf" = "no"; then + AC_MSG_ERROR([--with-ebpf=yes requires eBPF kernel header]) +fi +AM_CONDITIONAL(WITH_EBPF, test "${have_ebpf}" = "yes") + # SELinux support AC_ARG_WITH(selinux, AS_HELP_STRING([--with-selinux=yes|no|auto], [Build with SELinux (default: auto)]), @@ -623,7 +643,7 @@ AM_CONDITIONAL(WITH_JSON_VALIDATION, test "${enable_json_validation}" != "no") # 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. AC_ARG_ENABLE(polkit, AS_HELP_STRING([--enable-polkit=yes|no], [set default value for auth-polkit configuration option. This value can be overwritten by NM configuration. 'disabled' is an alias for 'no']), @@ -808,8 +828,8 @@ else AC_DEFINE(WITH_DHCPCANON, 0, [Define if you have dhcpcanon]) fi -# OpenVSwitch integration -AC_ARG_ENABLE(ovs, AS_HELP_STRING([--enable-ovs], [enable OpenVSwitch support])) +# Open vSwitch integration +AC_ARG_ENABLE(ovs, AS_HELP_STRING([--enable-ovs], [enable Open vSwitch support])) if test "${enable_ovs}" != "no"; then enable_ovs='yes' if test "$have_jansson" = "no"; then @@ -1043,7 +1063,7 @@ else more_logging_default=no fi -NM_COMPILER_WARNINGS(CFLAGS, ${more_warnings_default}) +NM_COMPILER_WARNINGS(AM_CFLAGS, ${more_warnings_default}) NM_COMPILER_FLAG(LIBSYSTEMD_NM_CFLAGS, "-Wno-gnu-variable-sized-type-not-at-end") AC_SUBST(LIBSYSTEMD_NM_CFLAGS) @@ -1051,7 +1071,7 @@ AC_SUBST(LIBSYSTEMD_NM_CFLAGS) CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ -fno-strict-aliasing \ ]) -CFLAGS="$CFLAGS $with_cflags" +AM_CFLAGS="$AM_CFLAGS $with_cflags" AC_ARG_ENABLE(more-asserts, AS_HELP_STRING([--enable-more-asserts], @@ -1248,6 +1268,7 @@ fi AM_CONDITIONAL(BUILD_DOCS, test "$build_docs" = "yes") AM_CONDITIONAL(HAVE_DOCS, test "$build_docs" = "yes" -o "$use_pregen_docs" = "yes") +AC_SUBST(AM_CFLAGS) AC_CONFIG_FILES([ Makefile @@ -1352,4 +1373,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 From 85563b7fc7ec2cd21e38debb9b28db342e2e8e7c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Apr 2019 21:09:51 +0200 Subject: New upstream version 1.18.0 --- configure.ac | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 967eac03..bf196780 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ dnl - add corresponding NM_VERSION_x_y_z macros in dnl "shared/nm-version-macros.h.in" dnl - update number in meson.build m4_define([nm_major_version], [1]) -m4_define([nm_minor_version], [16]) +m4_define([nm_minor_version], [18]) m4_define([nm_micro_version], [0]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) @@ -240,8 +240,9 @@ AM_CONDITIONAL(WITH_IWD, test x"${ac_with_iwd}" = x"yes") dnl dnl Checks for libdl - on certain platforms its part of libc dnl -AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=]) -AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen") +AC_SEARCH_LIBS([dlopen], [dl dld], + [test "$ac_cv_search_dlopen" = "none required" || AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen"]), + []) PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0], [AC_SUBST(LOG_DRIVER, '$(top_srcdir)/build-aux/tap-driver.sh') @@ -528,7 +529,8 @@ esac AC_ARG_WITH(ebpf, AS_HELP_STRING([--with-ebpf=yes|no|auto], [Build with eBPF support (default: auto)]), [], [with_ebpf=auto]) -if test "$with_ebpf" = "yes" -o "$with_ebpf" = "auto"; then +# 'auto' means 'false' because there are still some issues. +if test "$with_ebpf" = "yes" ; then AC_CHECK_HEADER(linux/bpf.h, [have_ebpf=yes], [have_ebpf=no]) else have_ebpf=no -- cgit 1.3.0-6-gf8a5