From ef8ed7cdbad16f381a8596fb54124d573ddd2b80 Mon Sep 17 00:00:00 2001 From: Druco Date: Thu, 20 Sep 2018 01:32:01 -0700 Subject: [PATCH] Eliminate requirement for unused libnm-gtk --- Makefile.am | 6 ++---- configure.ac | 1 - shared/nm-default.h | 14 -------------- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/Makefile.am b/Makefile.am index 32212d1..81c6923 100644 --- a/Makefile.am +++ b/Makefile.am @@ -194,14 +194,12 @@ properties_libnm_wireguard_properties_core_la_CPPFLAGS = \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ $(properties_cppflags) \ $(GTK_CFLAGS) \ - $(LIBNM_GLIB_CFLAGS) \ - $(LIBNM_GTK_CFLAGS) + $(LIBNM_GLIB_CFLAGS) properties_libnm_wireguard_properties_core_la_LIBADD = \ $(GLIB_LIBS) \ $(GTK_LIBS) \ - $(LIBNM_GLIB_LIBS) \ - $(LIBNM_GTK_LIBS) + $(LIBNM_GLIB_LIBS) if WITH_LIBNM_GLIB diff --git a/configure.ac b/configure.ac index c15952e..462962c 100644 --- a/configure.ac +++ b/configure.ac @@ -102,7 +102,6 @@ if test x"$with_gnome" != xno; then PKG_CHECK_MODULES(LIBSECRET, libsecret-1 >= 0.18) if test x"$with_libnm_glib" != xno; then - PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 1.7.0) PKG_CHECK_MODULES(LIBNM_GLIB, NetworkManager >= 1.7.0 libnm-util >= 1.7.0 diff --git a/shared/nm-default.h b/shared/nm-default.h index 4aeb62f..2b40b3d 100644 --- a/shared/nm-default.h +++ b/shared/nm-default.h @@ -106,18 +106,4 @@ #endif /* NM_VPN_OLD */ -/*****************************************************************************/ - -#if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR - -#ifdef NM_VPN_OLD -#include -#else /* NM_VPN_OLD */ -#include -#endif /* NM_VPN_OLD */ - -#endif /* NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR */ - -/*****************************************************************************/ - #endif /* __NM_DEFAULT_H__ */