[network-manager-applet/lr/pkcs11: 1/6] build: bump NetworkManager requirement to 1.8
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/lr/pkcs11: 1/6] build: bump NetworkManager requirement to 1.8
- Date: Sat, 18 Feb 2017 08:37:36 +0000 (UTC)
commit 6f13eef7f2292fdb066bda83bff4dd5e8ca37909
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Fri Feb 17 18:00:20 2017 +0000
build: bump NetworkManager requirement to 1.8
We'll need the NetworkManager 1.8 functionality to get the PKCS#11 support.
Makefile.am | 4 ----
configure.ac | 4 ++--
2 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index cba532f..48334b5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -646,8 +646,6 @@ nodist_src_connection_editor_nm_connection_editor_SOURCES = \
$(connection_editor_c_gen)
src_connection_editor_nm_connection_editor_CPPFLAGS = \
- -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_4 \
- -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4 \
-DICONDIR=\""$(datadir)/icons"\" \
-DBINDIR=\""$(bindir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
@@ -765,8 +763,6 @@ nodist_src_nm_applet_SOURCES = \
$(nm_applet_c_gen)
src_nm_applet_CPPFLAGS = \
- -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_4 \
- -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4 \
-DICONDIR=\""$(datadir)/icons"\" \
-DBINDIR=\""$(bindir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
diff --git a/configure.ac b/configure.ac
index 3e4a3dd..a390dc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,8 +93,8 @@ AM_CONDITIONAL(WITH_LIBNM_GTK, test "$with_libnm_gtk" != "no")
PKG_CHECK_MODULES(LIBNM, [libnm >= 1.3 gio-2.0 >= 2.32 gmodule-export-2.0])
LIBNM_CFLAGS="$LIBNM_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"
-LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_4"
-LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4"
+LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_8"
+LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_8"
PKG_CHECK_MODULES(LIBSECRET, [libsecret-unstable])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]