[network-manager-applet/th/vpn-auth-dialog-bgo765329: 1/2] build: bump min-required/max-allowed to NM_VERSION_1_4
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/th/vpn-auth-dialog-bgo765329: 1/2] build: bump min-required/max-allowed to NM_VERSION_1_4
- Date: Wed, 20 Apr 2016 15:02:05 +0000 (UTC)
commit 42506a4c67edb81ecfe44d205d879dce066b2349
Author: Thomas Haller <thaller redhat com>
Date: Wed Apr 20 16:45:02 2016 +0200
build: bump min-required/max-allowed to NM_VERSION_1_4
configure.ac | 8 ++++----
src/Makefile.am | 4 ++--
src/connection-editor/Makefile.am | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 26e6f71..4d04f1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,13 +81,13 @@ PKG_CHECK_MODULES(LIBNM_GLIB,
libnm-glib-vpn >= 1.1
gmodule-export-2.0])
LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"
-LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2"
-LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2"
+LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_4"
+LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4"
PKG_CHECK_MODULES(LIBNM, [libnm 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_2"
-LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2"
+LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_4"
+LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4"
PKG_CHECK_MODULES(LIBSECRET, [libsecret-unstable])
diff --git a/src/Makefile.am b/src/Makefile.am
index 258558e..05cae13 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,8 +10,8 @@ nm_applet_CPPFLAGS = \
$(MM_GLIB_CFLAGS) \
$(APPINDICATOR_CFLAGS) \
-DLIBNM_BUILD \
- -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2 \
- -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2 \
+ -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_4 \
+ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4 \
-DICONDIR=\""$(datadir)/icons"\" \
-DUIDIR=\""$(uidir)"\" \
-DBINDIR=\""$(bindir)"\" \
diff --git a/src/connection-editor/Makefile.am b/src/connection-editor/Makefile.am
index 59681f3..36df551 100644
--- a/src/connection-editor/Makefile.am
+++ b/src/connection-editor/Makefile.am
@@ -4,8 +4,8 @@ nm_connection_editor_CPPFLAGS = \
$(GTK_CFLAGS) \
$(LIBNM_CFLAGS) \
-DLIBNM_BUILD \
- -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2 \
- -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2 \
+ -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_4 \
+ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4 \
-DICONDIR=\""$(datadir)/icons"\" \
-DUIDIR=\""$(uidir)"\" \
-DBINDIR=\""$(bindir)"\" \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]