diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-03-07 09:43:03 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-03-07 09:48:48 +0100 |
| commit | 7a59d41e5f6666d0da51f1f7aae7518befdb1182 (patch) | |
| tree | 174cec330f90ec91906e32d1c8f818a371c16de7 | |
| parent | eee2fcfde7a6cd2465f8a39edae3945018f89b0e (diff) | |
| download | network-manager-applet-7a59d41e5f6666d0da51f1f7aae7518befdb1182.tar.gz | |
libnma/pygobject: libnma/NMA must use libnm/NM instead of legacy libraries1.7.0-dev
libnma uses libnm, and not libnm-util/libnm-glib. Hence, the python bindings
must load "NM" and not "NMClient"/"NetworkManager".
As it was, the generated bindings for libnma were unusable and loading
them would fail with
libnm-ERROR **: libnm-util symbols detected; Mixing libnm with libnm-util/libnm-glib is not supported
https://bugzilla.gnome.org/show_bug.cgi?id=779153
Fixes: 76a12beac4e8692f30071169e11e2b521ec4eab7
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index a57e15f0..e76c9bac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -532,7 +532,7 @@ pkgconfig_DATA += src/libnma/libnma.pc if HAVE_INTROSPECTION src/libnma/NMA-1.0.gir: src/libnma/libnma.la -src_libnma_NMA_1_0_gir_INCLUDES = NMClient-1.0 NetworkManager-1.0 Gtk-3.0 +src_libnma_NMA_1_0_gir_INCLUDES = NM-1.0 Gtk-3.0 src_libnma_NMA_1_0_gir_EXPORT_PACKAGES = libnma src_libnma_NMA_1_0_gir_CFLAGS = $(src_libnma_libnma_la_CFLAGS) src_libnma_NMA_1_0_gir_LIBS = src/libnma/libnma.la |