diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2017-02-17 18:00:20 +0000 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-03-19 21:04:45 +0100 |
| commit | 60d16df6d298a83491c7e4b2ef70ada0ef212217 (patch) | |
| tree | 4dfa286f6632cedb19552777de1e0d0f2e1f11c0 | |
| parent | 966b66c1e2e8a2dea5c227b9bc9074b1335c9ed0 (diff) | |
| download | network-manager-applet-60d16df6d298a83491c7e4b2ef70ada0ef212217.tar.gz | |
build: bump the version to 1.7, NetworkManager requirement to 1.8
We'll need the NetworkManager 1.8 functionality to get the PKCS#11 support.
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index e76c9bac..89fc4be4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -643,8 +643,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)"\" \ @@ -762,8 +760,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 5aeab40a..17878cc0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.63]) AC_INIT([nm-applet], - [1.4.7], + [1.7.0], [https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager], [network-manager-applet]) @@ -80,10 +80,10 @@ AC_ARG_WITH(libnm-gtk, AS_HELP_STRING([--without-libnm-gtk], [dont build legacy if test "$with_libnm_gtk" != no; then PKG_CHECK_MODULES(LIBNM_GLIB, [gio-2.0 >= 2.32 - NetworkManager >= 1.3 - libnm-glib >= 1.3 - libnm-util >= 1.3 - libnm-glib-vpn >= 1.3 + NetworkManager >= 1.7 + libnm-glib >= 1.7 + libnm-util >= 1.7 + libnm-glib-vpn >= 1.7 gmodule-export-2.0], :, [AC_MSG_FAILURE([$LIBNM_GLIB_PKG_ERRORS @@ -98,8 +98,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]) |