From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 25 Apr 2018 07:33:27 +0000 (+0200)
Subject: nm: Don't rely on NetworkManager.pc for paths when building without libnm-glib
X-Git-Tag: 5.6.3dr2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c4e4b5e8e3d1b6053b97521706c4f260e4a9c7b;p=thirdparty%2Fstrongswan.git

nm: Don't rely on NetworkManager.pc for paths when building without libnm-glib

Also make the paths configurable, in case the defaults don't work out on
a certain platform.
---

diff --git a/src/frontends/gnome/configure.ac b/src/frontends/gnome/configure.ac
index 1d3b4c9d1c..61de54010a 100644
--- a/src/frontends/gnome/configure.ac
+++ b/src/frontends/gnome/configure.ac
@@ -48,17 +48,27 @@ PKG_CHECK_MODULES(LIBSECRET, libsecret-1)
 
 AC_ARG_WITH(
 	[charon],
-	AS_HELP_STRING([--with-charon=file],[path to the strongSwan charon NetworkManager backend"]),
+	AS_HELP_STRING([--with-charon=file],[path to the strongSwan charon NetworkManager backend]),
 	[AC_SUBST(charon, "$withval")],
 	[AC_SUBST(charon, "${libexecdir}/ipsec/charon-nm")]
 )
+AC_ARG_WITH(
+	[nm-libexecdir],
+	AS_HELP_STRING([--nm-libexecdir=path],[use custom path where the auth dialog is installed]),
+	[nm_libexecdir="$withval"], []
+)
+AC_ARG_WITH(
+	[nm-plugindir],
+	AS_HELP_STRING([--nm-plugindir=path],[use custom path where the NM plugin is installed]),
+	[nm_plugindir="$withval"], []
+)
 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 comatibility]),
+	AS_HELP_STRING([--without-libnm-glib], [build NetworkManager-strongswan without libnm-glib comatibility]),
 	[with_libnm_glib=no],
 	[with_libnm_glib=yes]
 )
@@ -73,11 +83,22 @@ 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
 fi
 
-nm_libexecdir=$($PKG_CONFIG --variable=libgnome_serverdir NetworkManager)
 AC_SUBST(nm_libexecdir)
-nm_plugindir=$($PKG_CONFIG --variable=plugindir NetworkManager)
 AC_SUBST(nm_plugindir)
 test x"$enable_nm_absolute_paths" = x"yes" && nm_plugindir_abs="$(nm_plugindir)/"
 AC_SUBST(nm_plugindir_abs)