From: Martin Willi <martin@strongswan.org>
Date: Tue, 8 Dec 2009 13:35:16 +0000 (+0100)
Subject: Support "_" and "-" variants of NetworkManager pkg-config packages
X-Git-Tag: 4.3.6~145
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=89d236f0da94effc6f30404b1dfd7d8b509e34bc;p=thirdparty%2Fstrongswan.git

Support "_" and "-" variants of NetworkManager pkg-config packages
---

diff --git a/configure.in b/configure.in
index a8818a9656..2c2ffaf024 100644
--- a/configure.in
+++ b/configure.in
@@ -517,7 +517,10 @@ if test x$uci = xtrue; then
 fi
 
 if test x$nm = xtrue; then
-	PKG_CHECK_MODULES(nm, [NetworkManager libnm_glib_vpn gthread-2.0])
+	PKG_CHECK_EXISTS([libnm-glib],
+		[PKG_CHECK_MODULES(nm, [NetworkManager gthread-2.0 libnm-glib libnm-glib-vpn])],
+		[PKG_CHECK_MODULES(nm, [NetworkManager gthread-2.0 libnm_glib libnm_glib_vpn])]
+	)
 	AC_SUBST(nm_CFLAGS)
 	AC_SUBST(nm_LIBS)
 fi
diff --git a/src/charon/plugins/nm/gnome/configure.ac b/src/charon/plugins/nm/gnome/configure.ac
index ffa3c825db..7a8860331e 100644
--- a/src/charon/plugins/nm/gnome/configure.ac
+++ b/src/charon/plugins/nm/gnome/configure.ac
@@ -76,7 +76,10 @@ if test x"$with_gnome" != xno; then
 	AC_SUBST(GNOMEKEYRING_LIBS)
 fi
 
-PKG_CHECK_MODULES(NM_UTILS, NetworkManager >= 0.7.0 libnm-util libnm_glib libnm_glib_vpn)
+PKG_CHECK_EXISTS([libnm-glib],
+	[PKG_CHECK_MODULES(NM_UTILS, NetworkManager >= 0.7.0 libnm-util libnm-glib libnm-glib-vpn)],
+	[PKG_CHECK_MODULES(NM_UTILS, NetworkManager >= 0.7.0 libnm-util libnm_glib libnm_glib_vpn)]
+)
 AC_SUBST(NM_UTILS_CFLAGS)
 AC_SUBST(NM_UTILS_LIBS)