diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-08-24 17:47:51 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-10-13 19:46:05 +0200 |
| commit | a8d78602c537eb632d6f92b1f92b77123f8736ee (patch) | |
| tree | 001b3c17fa81fd439aadcd2eea93ef66fb032f7f /configure.ac | |
| parent | 01837f1c04d49dc856299e5f9961c0b5745b2b9b (diff) | |
build: allow build without libnm-glib
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index f1639c3..38faa55 100644 --- a/configure.ac +++ b/configure.ac @@ -45,6 +45,9 @@ AM_CONDITIONAL(WITH_GNOME, test x"$with_gnome" != xno) AC_ARG_WITH(authdlg, AS_HELP_STRING([--without-authdlg], [Build NetworkManager-iodine without authentication dialog])) AM_CONDITIONAL(WITH_AUTHDLG, test x"$with_authdlg" != xno) +AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-iodine without libnm-glib comatibility])) +AM_CONDITIONAL(WITH_LIBNM_GLIB, test x"$with_libnm_glib" != xno) + GETTEXT_PACKAGE=NetworkManager-iodine AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) @@ -57,17 +60,19 @@ if test x"$with_gnome" != xno; then PKG_CHECK_MODULES(GTK, gtk+-3.0 > $gtk3_req, , [PKG_CHECK_MODULES(GTK, gtk+-2.0 > $gtk2_req)]) + PKG_CHECK_MODULES(LIBNMA, libnma >= 1.1.0) PKG_CHECK_MODULES(LIBSECRET, libsecret-1) - PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 0.9.9.0) - PKG_CHECK_MODULES(LIBNMA, libnma >= 1.1.0) -fi + if test x"$with_libnm_glib" != xno; then + PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 0.9.9.0) + PKG_CHECK_MODULES(LIBNM_GLIB, + NetworkManager >= 1.1.0 + libnm-util >= 1.1.0 + libnm-glib >= 1.1.0 + libnm-glib-vpn >= 1.1.0) + fi -PKG_CHECK_MODULES(LIBNM_GLIB, - NetworkManager >= 1.1.0 - libnm-util >= 1.1.0 - libnm-glib >= 1.1.0 - libnm-glib-vpn >= 1.1.0) +fi PKG_CHECK_MODULES(LIBNM, libnm >= 1.1.0) LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2" |