diff options
| author | Dominique Leuenberger <dimstar@opensuse.org> | 2016-05-02 12:30:57 +0200 |
|---|---|---|
| committer | Dominique Leuenberger <dimstar@opensuse.org> | 2016-05-02 12:30:57 +0200 |
| commit | d3d8614b51ea689cc68b50c4889bceb91473d5e5 (patch) | |
| tree | 688317a7e8a84c85a47cec3c1b023e0c6b9f61b6 | |
| parent | d1f0d959877aba556a3a5d0de523b5d450688429 (diff) | |
| download | libproxy-git-d3d8614b51ea689cc68b50c4889bceb91473d5e5.tar.gz | |
NetworkManager: detect libnm before looking for NetworkManager
Prefer the newer libnm symbol and only fall back to the legacy NetworkManager
if not found
Fixes https://github.com/libproxy/libproxy/issues/26 - 2nd part
| -rw-r--r-- | libproxy/cmake/modules/network_networkmanager.cmk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libproxy/cmake/modules/network_networkmanager.cmk b/libproxy/cmake/modules/network_networkmanager.cmk index d9f9588..4399557 100644 --- a/libproxy/cmake/modules/network_networkmanager.cmk +++ b/libproxy/cmake/modules/network_networkmanager.cmk @@ -1,3 +1,6 @@ if (NOT WIN32 AND NOT APPLE) - px_check_modules(NM NetworkManager dbus-1) -endif()
\ No newline at end of file + px_check_modules(NM libnm dbus-1) + if (NOT NM_FOUND) + px_check_modules(NM NetworkManager dbus-1) + endif (NOT NM_FOUND) +endif() |