denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nm: Remove old libnm-glib compat stuff

Browse Source 
This shouldn't be necessary anymore.
This commit is contained in:
Tobias Brunner
2022-05-16 11:46:22 +02:00
parent 64d73235c4
commit 085daf4743
5 changed files with 5 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/gnome/configure.ac
+5 -24
View File
@@ -66,36 +66,17 @@ AC_ARG_ENABLE(
[nm-absolute-paths],
AS_HELP_STRING([--enable-nm-absolute-paths],[use absolute paths for NM plugins in the .name file])
)
AC_ARG_WITH(
[libnm-glib],
AS_HELP_STRING([--without-libnm-glib], [build NetworkManager-strongswan without libnm-glib compatibility]),
[with_libnm_glib=no],
[with_libnm_glib=yes]
)
AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
PKG_CHECK_MODULES(LIBNM, libnm >= 1.1.0)
LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2"
LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2"
PKG_CHECK_MODULES(LIBNMA, libnma >= 1.1.0)
if test x"$with_libnm_glib" != xno; then
PKG_CHECK_MODULES(LIBNM_GLIB, NetworkManager >= 1.1.0 libnm-util libnm-glib libnm-glib-vpn)
PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 1.1.0)
if test -z "$nm_libexecdir"; then
nm_libexecdir=$($PKG_CONFIG --variable=libgnome_serverdir NetworkManager)
fi
if test -z "$nm_plugindir"; then
nm_plugindir=$($PKG_CONFIG --variable=plugindir NetworkManager)
fi
else
if test -z "$nm_libexecdir"; then
nm_libexecdir=$($PKG_CONFIG --variable=exec_prefix libnm)/lib/NetworkManager
fi
if test -z "$nm_plugindir"; then
nm_plugindir=$($PKG_CONFIG --variable=libdir libnm)/NetworkManager
fi
if test -z "$nm_libexecdir"; then
nm_libexecdir=$($PKG_CONFIG --variable=exec_prefix libnm)/lib/NetworkManager
fi
if test -z "$nm_plugindir"; then
nm_plugindir=$($PKG_CONFIG --variable=libdir libnm)/NetworkManager
fi
AC_SUBST(nm_libexecdir)