diff options
| author | Michael Biebl <biebl@debian.org> | 2018-07-01 20:58:23 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-07-01 20:58:23 +0200 |
| commit | 429393567647935d9123e21fd27a7529d50255eb (patch) | |
| tree | b5a99bf0cbbe77fccd7fee81caf71915ccf9eb96 /configure.ac | |
| parent | 069cb5c3a525ebcc19cc2927964258acaca87b13 (diff) | |
New upstream version 1.12.0 upstream/1.12.0
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 641af9bf..97fe1b7c 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], [11]) -m4_define([nm_micro_version], [90]) +m4_define([nm_minor_version], [12]) +m4_define([nm_micro_version], [0]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) @@ -391,10 +391,8 @@ AC_ARG_WITH(config-logging-backend-default, nm_config_logging_backend_default="$withval", nm_config_logging_backend_default="") -if test "$nm_config_logging_backend_default" != 'debug' \ - -a "$nm_config_logging_backend_default" != 'syslog' \ - -a "$nm_config_logging_backend_default" != 'journal' \ - -a "$nm_config_logging_backend_default" != 'journal-syslog-style'; then +if test "$nm_config_logging_backend_default" != 'syslog' \ + -a "$nm_config_logging_backend_default" != 'journal'; then # unknown backend. Reset to default. Silently accept the invalid value to # be future proof. nm_config_logging_backend_default='' |