Eliminate requirement for unused libnm-gtk
parent
0a81b09942
commit
ef8ed7cdba
|
@ -194,14 +194,12 @@ properties_libnm_wireguard_properties_core_la_CPPFLAGS = \
|
||||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
|
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
|
||||||
$(properties_cppflags) \
|
$(properties_cppflags) \
|
||||||
$(GTK_CFLAGS) \
|
$(GTK_CFLAGS) \
|
||||||
$(LIBNM_GLIB_CFLAGS) \
|
$(LIBNM_GLIB_CFLAGS)
|
||||||
$(LIBNM_GTK_CFLAGS)
|
|
||||||
|
|
||||||
properties_libnm_wireguard_properties_core_la_LIBADD = \
|
properties_libnm_wireguard_properties_core_la_LIBADD = \
|
||||||
$(GLIB_LIBS) \
|
$(GLIB_LIBS) \
|
||||||
$(GTK_LIBS) \
|
$(GTK_LIBS) \
|
||||||
$(LIBNM_GLIB_LIBS) \
|
$(LIBNM_GLIB_LIBS)
|
||||||
$(LIBNM_GTK_LIBS)
|
|
||||||
|
|
||||||
|
|
||||||
if WITH_LIBNM_GLIB
|
if WITH_LIBNM_GLIB
|
||||||
|
|
|
@ -102,7 +102,6 @@ if test x"$with_gnome" != xno; then
|
||||||
PKG_CHECK_MODULES(LIBSECRET, libsecret-1 >= 0.18)
|
PKG_CHECK_MODULES(LIBSECRET, libsecret-1 >= 0.18)
|
||||||
|
|
||||||
if test x"$with_libnm_glib" != xno; then
|
if test x"$with_libnm_glib" != xno; then
|
||||||
PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 1.7.0)
|
|
||||||
PKG_CHECK_MODULES(LIBNM_GLIB,
|
PKG_CHECK_MODULES(LIBNM_GLIB,
|
||||||
NetworkManager >= 1.7.0
|
NetworkManager >= 1.7.0
|
||||||
libnm-util >= 1.7.0
|
libnm-util >= 1.7.0
|
||||||
|
|
|
@ -106,18 +106,4 @@
|
||||||
|
|
||||||
#endif /* NM_VPN_OLD */
|
#endif /* NM_VPN_OLD */
|
||||||
|
|
||||||
/*****************************************************************************/
|
|
||||||
|
|
||||||
#if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR
|
|
||||||
|
|
||||||
#ifdef NM_VPN_OLD
|
|
||||||
#include <nm-ui-utils.h>
|
|
||||||
#else /* NM_VPN_OLD */
|
|
||||||
#include <nma-ui-utils.h>
|
|
||||||
#endif /* NM_VPN_OLD */
|
|
||||||
|
|
||||||
#endif /* NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR */
|
|
||||||
|
|
||||||
/*****************************************************************************/
|
|
||||||
|
|
||||||
#endif /* __NM_DEFAULT_H__ */
|
#endif /* __NM_DEFAULT_H__ */
|
||||||
|
|
Loading…
Reference in New Issue