Support "_" and "-" variants of NetworkManager pkg-config packages
This commit is contained in:
parent
f469754f7f
commit
89d236f0da
|
@ -517,7 +517,10 @@ if test x$uci = xtrue; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test x$nm = xtrue; then
|
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_CFLAGS)
|
||||||
AC_SUBST(nm_LIBS)
|
AC_SUBST(nm_LIBS)
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -76,7 +76,10 @@ if test x"$with_gnome" != xno; then
|
||||||
AC_SUBST(GNOMEKEYRING_LIBS)
|
AC_SUBST(GNOMEKEYRING_LIBS)
|
||||||
fi
|
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_CFLAGS)
|
||||||
AC_SUBST(NM_UTILS_LIBS)
|
AC_SUBST(NM_UTILS_LIBS)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue