67 lines
2.7 KiB
Diff
67 lines
2.7 KiB
Diff
|
From 42183b79dc53b42c370c16a6c2596c9560e92c56 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lubomir Rintel <lkundrak@v3.sk>
|
||
|
|
Date: Wed, 17 Oct 2018 15:21:30 +0200
|
||
|
|
Subject: [PATCH] build: disable libnm-glib support by default
|
||
|
|
|
||
|
|
By now nobody should be using this. Keep the code around for a little
|
||
|
|
longer just in case anybody still uses this.
|
||
|
|
|
||
|
|
The libnm-glib support also serves as an example how do we build two
|
||
|
|
different versions of the properties plugin. We'll soon be in a similar
|
||
|
|
situation with Gtk 4.0. (sigh.) Just don't drop it yet.
|
||
|
|
|
||
|
|
https://gitlab.gnome.org/GNOME/NetworkManager-pptp/merge_requests/4
|
||
|
|
---
|
||
|
|
NEWS | 10 ++++++++++
|
||
|
|
configure.ac | 8 ++++----
|
||
|
|
2 files changed, 14 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/NEWS b/NEWS
|
||
|
|
index dc830e6..705bde6 100644
|
||
|
|
--- a/NEWS
|
||
|
|
+++ b/NEWS
|
||
|
|
@@ -1,3 +1,13 @@
|
||
|
|
+==========================================================
|
||
|
|
+NetworkManager-pptp-1.2.10 (not released yet)
|
||
|
|
+Overview of changes since NetworkManager-pptp-1.2.8
|
||
|
|
+==========================================================
|
||
|
|
+
|
||
|
|
+* libnm-glib compatibility (NetworkManager < 1.0) is disabled by default.
|
||
|
|
+ It can be enabled by passing --with-libnm-glib to configure script.
|
||
|
|
+ Nobody should need it by now. Users that still use this are encourage
|
||
|
|
+ to let us know before the libnm-glib support is removed for good.
|
||
|
|
+
|
||
|
|
=======================================================
|
||
|
|
NetworkManager-pptp-1.2.8
|
||
|
|
Overview of changes since NetworkManager-pptp-1.2.6
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 757c573..d42fba3 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -72,7 +72,7 @@ dnl
|
||
|
|
dnl GNOME support
|
||
|
|
dnl
|
||
|
|
AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-pptp without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
|
||
|
|
-AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-pptp without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
|
||
|
|
+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-pptp with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
|
||
|
|
if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
|
||
|
|
if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
|
||
|
|
AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
|
||
|
|
@@ -82,10 +82,10 @@ if test "$with_gnome" != no; then
|
||
|
|
with_gnome=yes
|
||
|
|
fi
|
||
|
|
if test "$with_libnm_glib_specified" == no; then
|
||
|
|
- with_libnm_glib="$with_gnome"
|
||
|
|
+ with_libnm_glib=no
|
||
|
|
fi
|
||
|
|
-if test "$with_libnm_glib" != no; then
|
||
|
|
- with_libnm_glib=yes
|
||
|
|
+if test "$with_libnm_glib" != yes; then
|
||
|
|
+ with_libnm_glib=no
|
||
|
|
fi
|
||
|
|
AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
|
||
|
|
AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
|
||
|
|
--
|
||
|
|
2.24.1
|
||
|
|
|