diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-08-24 17:03:18 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-09-01 14:11:22 +0200 |
| commit | c93b76e1555041da2381ab6b03f8cca3720af267 (patch) | |
| tree | c54cb8cc59c869b62df1326b436fa119796cffa7 | |
| parent | 9a5937277d07a31a613003dff0d5446ae4fb8c89 (diff) | |
build: check for libnm & libnma
| -rw-r--r-- | auth-dialog/Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | properties/Makefile.am | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
4 files changed, 16 insertions, 11 deletions
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am index 08f9e20..b799c42 100644 --- a/auth-dialog/Makefile.am +++ b/auth-dialog/Makefile.am @@ -1,10 +1,10 @@ libexec_PROGRAMS = nm-iodine-auth-dialog nm_iodine_auth_dialog_CPPFLAGS = \ - $(NM_CFLAGS) \ $(GTK_CFLAGS) \ $(LIBSECRET_CFLAGS) \ - $(NMGTK_CFLAGS) \ + $(LIBNM_GLIB_CFLAGS) \ + $(LIBNM_GTK_CFLAGS) \ -DICONDIR=\""$(datadir)/pixmaps"\" \ -DBINDIR=\""$(bindir)"\" \ -DG_DISABLE_DEPRECATED \ @@ -19,8 +19,8 @@ nm_iodine_auth_dialog_SOURCES = \ nm_iodine_auth_dialog_LDADD = \ $(GTK_LIBS) \ - $(NM_LIBS) \ - $(NMGTK_LIBS) \ + $(LIBNM_GLIB_LIBS) \ + $(LIBNM_GTK_LIBS) \ $(LIBSECRET_LIBS) CLEANFILES = *~ diff --git a/configure.ac b/configure.ac index a783633..64ff179 100644 --- a/configure.ac +++ b/configure.ac @@ -59,15 +59,20 @@ if test x"$with_gnome" != xno; then PKG_CHECK_MODULES(LIBSECRET, libsecret-1) - PKG_CHECK_MODULES(NMGTK, libnm-gtk >= 0.9.9.0) + PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 0.9.9.0) + PKG_CHECK_MODULES(LIBNMA, libnma >= 1.1.0) fi -PKG_CHECK_MODULES(NM, +PKG_CHECK_MODULES(LIBNM_GLIB, NetworkManager >= 0.9.2 libnm-util >= 0.9.2 libnm-glib >= 0.9.2 libnm-glib-vpn >= 0.9.2) +PKG_CHECK_MODULES(LIBNM, libnm >= 1.1.0) +LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2" +LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2" + NM_COMPILER_WARNINGS AC_CONFIG_FILES([ diff --git a/properties/Makefile.am b/properties/Makefile.am index 2787295..0d8bbc8 100644 --- a/properties/Makefile.am +++ b/properties/Makefile.am @@ -13,7 +13,7 @@ ui_DATA = nm-iodine-dialog.ui common_CFLAGS = \ $(GTK_CFLAGS) \ - $(NM_CFLAGS) \ + $(LIBNM_GLIB_CFLAGS) \ -I$(top_srcdir)/src \ -DICONDIR=\""$(datadir)/pixmaps"\" \ -DUIDIR=\""$(uidir)"\" \ @@ -32,11 +32,11 @@ libnm_iodine_properties_la_CFLAGS = \ libnm_vpn_plugin_iodine_la_LIBADD = \ $(GTK_LIBS) \ - $(NM_LIBS) + $(LIBNM_GLIB_LIBS) libnm_iodine_properties_la_LIBADD = \ $(GTK_LIBS) \ - $(NM_LIBS) + $(LIBNM_GLIB_LIBS) libnm_vpn_plugin_iodine_la_LDFLAGS = \ -avoid-version diff --git a/src/Makefile.am b/src/Makefile.am index 8ca103a..904c8b4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = \ - $(NM_CFLAGS) \ + $(LIBNM_GLIB_CFLAGS) \ -DG_DISABLE_DEPRECATED \ -DBINDIR=\"$(bindir)\" \ -DPREFIX=\""$(prefix)"\" \ @@ -19,6 +19,6 @@ nm_iodine_service_SOURCES = \ nm-iodine-service-defines.h nm_iodine_service_LDADD = \ - $(NM_LIBS) + $(LIBNM_GLIB_LIBS) CLEANFILES = *~ |