diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2018-06-15 12:09:07 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2018-06-15 13:07:53 +0200 |
| commit | df58895fb3479c4f00b9107126759d138250fef2 (patch) | |
| tree | 192e8536b2198c232727a7ba7632df35f1bffd83 | |
| parent | 576cbb771aafce4a1aeceb9ee99bffbdd63164e7 (diff) | |
| download | NetworkManager-df58895fb3479c4f00b9107126759d138250fef2.tar.gz | |
build: disable libnm-glib by default
It's deprecated and has been replaced by libnm for 6 major releases now.
Its use in modern distributions has faded to the point it can probably
be safely removed.
| -rw-r--r-- | NEWS | 4 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | meson_options.txt | 2 |
4 files changed, 12 insertions, 8 deletions
@@ -33,6 +33,10 @@ Notable changes included in this snapshot so far include: instead of replacing /etc/resolv.conf with a plain file. * Added wake_on_wlan connection setting to configure wake-on-wireless-lan (WoWLAN). +* The libnm-glib library, deprecated in favor of libnm since NetworkManager 1.0, + is now not built by default. While it can still be enabled, the distributions + should have a good plan for removing it if they need to keep shipping it at + this point. The following features were backported to 1.10.x releases from 1.10.0 to 1.10.8 are also present in NetworkManager-1.12: diff --git a/autogen.sh b/autogen.sh index 9bb0294888..836bb60307 100755 --- a/autogen.sh +++ b/autogen.sh @@ -28,5 +28,5 @@ AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose cd $olddir if test -z "$NOCONFIGURE"; then - exec $srcdir/configure --enable-maintainer-mode --enable-more-warnings=error --enable-gtk-doc --enable-introspection "$@" + exec $srcdir/configure --enable-maintainer-mode --enable-more-warnings=error --enable-gtk-doc --enable-introspection --with-libnm-glib "$@" fi diff --git a/configure.ac b/configure.ac index 23cf8019aa..0ca1248bf6 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/meson_options.txt b/meson_options.txt index f22eb28a4f..bafc676911 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -37,7 +37,7 @@ option('ofono', type: 'boolean', value: false, description: 'Enable oFono suppor option('concheck', type: 'boolean', value: true, description: 'enable connectivity checking support') option('teamdctl', type: 'boolean', value: false, description: 'enable Teamd control support') option('ovs', type: 'boolean', value: true, description: 'enable OpenVSwitch support') -option('libnm_glib', type: 'boolean', value: true, description: 'don\'t build legacy libraries') +option('libnm_glib', type: 'boolean', value: false, description: 'build legacy libraries') option('nmcli', type: 'boolean', value: true, description: 'Build nmcli') option('nmtui', type: 'boolean', value: true, description: 'Build nmtui') option('bluez5_dun', type: 'boolean', value: false, description: 'enable Bluez5 DUN support') |