diff options
| -rw-r--r-- | CMakeLists.txt | 14 | ||||
| -rw-r--r-- | config.h.cmake | 3 | ||||
| -rw-r--r-- | tdecore/tdehw/networkbackends/network-manager/network-manager.h | 5 |
3 files changed, 20 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1628a580d..7c2ff7b72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1339,6 +1339,20 @@ if( NOT WITH_${DEFAULT_SPELL_CHECKER} ) endif() +#### Check for libnm ############################ + +if( WITH_NETWORK_MANAGER_BACKEND ) + pkg_search_module( LIBNM libnsm ) + if( NOT LIBNM_FOUND ) + tde_message_fatal( "Compiling the NetworkManager backend required libnm, but it was not found." ) + endif( NOT LIBNM_FOUND ) + pkg_get_variable( NM_VPN_SERVICE_DIR libnm vpnservicedir ) + if( "${NM_VPN_SERVICE_DIR}" STREQUAL "" ) + tde_message_fatal( "Unable to read 'vpnservicedir' from libnm pkg-config file." ) + endif( "${NM_VPN_SERVICE_DIR}" STREQUAL "" ) +endif( WITH_NETWORK_MANAGER_BACKEND ) + + ##### enable TDEIconLoader debugging ############ if ( WITH_TDEICONLOADER_DEBUG ) diff --git a/config.h.cmake b/config.h.cmake index 2f29ba382..cd2ec1c96 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -891,6 +891,9 @@ /* Defined if compiling with the network-manager backend */ #cmakedefine WITH_NETWORK_MANAGER_BACKEND 1 +/* Directory where NetworkManager VPN service files are located */ +#cmakedefine NM_VPN_SERVICE_DIR "@NM_VPN_SERVICE_DIR@" + /* Defined if compiling with old XDG standard support */ #cmakedefine WITH_OLD_XDG_STD 1 diff --git a/tdecore/tdehw/networkbackends/network-manager/network-manager.h b/tdecore/tdehw/networkbackends/network-manager/network-manager.h index e21e2837d..241e83706 100644 --- a/tdecore/tdehw/networkbackends/network-manager/network-manager.h +++ b/tdecore/tdehw/networkbackends/network-manager/network-manager.h @@ -18,6 +18,7 @@ #ifndef _TDENETWORKBACKEND_NETWORKMANAGER_H #define _TDENETWORKBACKEND_NETWORKMANAGER_H +#include "config.h" #include "tdenetworkconnections.h" //==================================================================================================== @@ -142,8 +143,8 @@ #define NM_802_11_DEVICE_CAP_WPA 0x10 #define NM_802_11_DEVICE_CAP_RSN 0x20 //==================================================================================================== -#define NM_PLUGIN_SERVICE_DIR_ETC "/etc/NetworkManager/VPN" // old plugin location -#define NM_PLUGIN_SERVICE_DIR_LIB "/usr/lib/NetworkManager/VPN" // new plugin location +#define NM_PLUGIN_SERVICE_DIR_ETC "/etc/NetworkManager/VPN" // old plugin location +#define NM_PLUGIN_SERVICE_DIR_LIB NM_VPN_SERVICE_DIR // new plugin location //==================================================================================================== //==================================================================================================== |