diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-07-31 20:35:28 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-07-31 22:19:52 +0200 |
| commit | 833ea6944d5abeb05d9fd36cf5176fd6ce1bde7a (patch) | |
| tree | 07a2e60aaeec8e8524bb703da49f333a33ab25c8 /src | |
| parent | bf55c668e5b143c4288e6bf90a37da969bace85b (diff) | |
| download | NetworkManager-833ea6944d5abeb05d9fd36cf5176fd6ce1bde7a.tar.gz | |
build: fix linker error for '--disable-concheck' and add '--with-libsoup'
When building with '--disable-concheck' with libsoup installed,
configure would set HAVE_LIBSOUP. But without connection
checking, we didn't link against libsoup, resulting in a
linker error.
Add a new configure option '--with-libsoup' / '--without-libsoup'
to control whether linking against libsoup.
The combination '--without-libsoup --enable-concheck' does not
make sense.
https://bugzilla.gnome.org/show_bug.cgi?id=734062
Signed-off-by: Thomas Haller <thaller@redhat.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/dns-manager/nm-dns-manager.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 681a48f15b..b637ebfc2c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -362,7 +362,7 @@ libNetworkManager_la_LIBADD = \ $(LIBDL) \ $(LIBM) -if WITH_CONCHECK +if WITH_LIBSOUP libNetworkManager_la_LIBADD += $(LIBSOUP_LIBS) endif diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c index 4e90068d8d..4471cb8f40 100644 --- a/src/dns-manager/nm-dns-manager.c +++ b/src/dns-manager/nm-dns-manager.c @@ -47,7 +47,7 @@ #include "nm-dns-dnsmasq.h" #include "nm-dns-unbound.h" -#if HAVE_LIBSOUP +#if WITH_LIBSOUP #include <libsoup/soup.h> #ifdef SOUP_CHECK_VERSION |