diff options
| author | Michael Biebl <biebl@debian.org> | 2018-06-17 14:54:10 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-06-17 14:54:10 +0200 |
| commit | 069cb5c3a525ebcc19cc2927964258acaca87b13 (patch) | |
| tree | 66ac6b21a44d630c0fc281c0df327239d491226a /configure.ac | |
| parent | 04bc9e1cd3544445d883ad29ea108c1645c8e7b7 (diff) | |
New upstream version 1.11.90 upstream/1.11.90
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 23cf8019..641af9bf 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], [11]) -m4_define([nm_micro_version], [4]) +m4_define([nm_micro_version], [90]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) @@ -256,26 +256,26 @@ AC_SUBST(GLIB_LIBS) GOBJECT_INTROSPECTION_CHECK([0.9.6]) AC_ARG_WITH(libnm-glib, - AS_HELP_STRING([--without-libnm-glib], - [don"'"t build legacy libraries])) + AS_HELP_STRING([--with-libnm-glib], + [build legacy libraries])) fake_typelibs=no -if test "$with_libnm_glib" != "no"; then +if test "$with_libnm_glib" == "yes"; then PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.1 dbus-glib-1 >= 0.94, :, [AC_MSG_FAILURE([$DBUS_PKG_ERRORS Configure with --without-libnm-glib if you do not need the legacy libraries]) ]) - with_libnm_glib=yes - if test "${found_introspection}" = "yes"; then AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources) if ! test x"$GLIB_COMPILE_RESOURCES" = x""; then fake_typelibs=yes fi fi +else + with_libnm_glib=no fi -AM_CONDITIONAL(WITH_LEGACY_LIBRARIES, test "$with_libnm_glib" != "no") +AM_CONDITIONAL(WITH_LEGACY_LIBRARIES, test "$with_libnm_glib" == "yes") if test "$fake_typelibs" = "yes"; then AC_DEFINE(WITH_FAKE_TYPELIBS, 1, [Define for libnm to prevent GIR from loading libnm-glib]) else |