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

diff --git a/configure.in b/configure.in
index a8818a9..2c2ffaf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -517,7 +517,10 @@ if test x$uci = xtrue; then
 fi
 
 if test x$nm = 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
        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 ffa3c82..7a88603 100644 (file)
--- 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
 
        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)
 
 AC_SUBST(NM_UTILS_CFLAGS)
 AC_SUBST(NM_UTILS_LIBS)