diff options
| author | Martin Willi <martin@strongswan.org> | 2009-12-08 14:35:16 +0100 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2009-12-08 14:36:22 +0100 |
| commit | 89d236f0da94effc6f30404b1dfd7d8b509e34bc (patch) | |
| tree | a3cfcd18ffc763df4d4272e3631a9a55f19ab51d | |
| parent | f469754f7ffce2e45400a58f054f851b3f6bf277 (diff) | |
| download | strongswan-89d236f0da94effc6f30404b1dfd7d8b509e34bc.tar.bz2 strongswan-89d236f0da94effc6f30404b1dfd7d8b509e34bc.tar.xz | |
Support "_" and "-" variants of NetworkManager pkg-config packages
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | src/charon/plugins/nm/gnome/configure.ac | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/configure.in b/configure.in index a8818a965..2c2ffaf02 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 ffa3c825d..7a8860331 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) |