diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2019-04-03 08:52:38 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2019-04-03 08:52:38 +0200 |
| commit | b027723e00679f2b709880407a6ff24583faeae3 (patch) | |
| tree | b972843460a92d737edb7512444b24791118f9de /configure.ac | |
| parent | 61aad8cda475a07d579a85f209696d1ff8fd3e84 (diff) | |
| download | NetworkManager-b027723e00679f2b709880407a6ff24583faeae3.tar.gz | |
Revert "all: goodbye libnm-glib"
We need this for a little little longer :(
This reverts commit 1de8383ad9fdfc8f552117e5d109bdfa7005634b.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index fc09bd4617..f4b1535c08 100644 --- a/configure.ac +++ b/configure.ac @@ -257,6 +257,34 @@ AC_SUBST(GLIB_LIBS) GOBJECT_INTROSPECTION_CHECK([0.9.6]) +AC_ARG_WITH(libnm-glib, + AS_HELP_STRING([--with-libnm-glib], + [build legacy libraries])) +fake_typelibs=no +if test "$with_libnm_glib" == "yes"; then + PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.1 dbus-glib-1 >= 0.94, :, + [AC_MSG_FAILURE([$DBUS_PKG_ERRORS + +Configure with --without-libnm-glib if you do not need the legacy libraries]) + ]) + + if test "${found_introspection}" = "yes"; then + AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources) + if ! test x"$GLIB_COMPILE_RESOURCES" = x""; then + fake_typelibs=yes + fi + fi +else + with_libnm_glib=no +fi +AM_CONDITIONAL(WITH_LEGACY_LIBRARIES, test "$with_libnm_glib" == "yes") +if test "$fake_typelibs" = "yes"; then + AC_DEFINE(WITH_FAKE_TYPELIBS, 1, [Define for libnm to prevent GIR from loading libnm-glib]) +else + AC_DEFINE(WITH_FAKE_TYPELIBS, 0, [Define for libnm to prevent GIR from loading libnm-glib]) +fi +AM_CONDITIONAL(WITH_FAKE_TYPELIBS, test "${fake_typelibs}" = "yes") + PKG_CHECK_MODULES([LIBUDEV], [libudev >= 175]) # Qt4 @@ -1247,10 +1275,17 @@ AC_CONFIG_FILES([ Makefile shared/nm-version-macros.h libnm/libnm.pc +libnm-util/libnm-util.pc +libnm-glib/libnm-glib.pc +libnm-glib/libnm-glib-vpn.pc po/Makefile.in data/org.freedesktop.NetworkManager.policy.in docs/api/Makefile docs/api/version.xml +docs/libnm-glib/Makefile +docs/libnm-glib/version.xml +docs/libnm-util/Makefile +docs/libnm-util/version.xml docs/libnm/Makefile docs/libnm/version.xml NetworkManager.pc @@ -1299,6 +1334,7 @@ echo " ofono: $with_ofono" echo " concheck: $enable_concheck" echo " libteamdctl: $enable_teamdctl" echo " ovs: $enable_ovs" +echo " libnm-glib: $with_libnm_glib" echo " nmcli: $build_nmcli" echo " nmtui: $build_nmtui" echo " iwd: $ac_with_iwd" |