Commit ee4b8cc8 authored by Guillaume Desmottes's avatar Guillaume Desmottes

configure.ac: remove connectivity libs checks

parent 384fcd8f
......@@ -265,58 +265,6 @@ GETTEXT_PACKAGE=empathy
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name])
# -----------------------------------------------------------
# Connectivity integration
# -----------------------------------------------------------
AC_ARG_WITH(connectivity,
AS_HELP_STRING([--with-connectivity=@<:@nm/connman/auto/no@:>@],
[build with connectivity support]), ,
with_connectivity=auto)
if test "x$with_connectivity" = "xno"; then
have_nm=no
have_connman=no
elif test "x$with_connectivity" = "xconnman"; then
have_nm=no
PKG_CHECK_MODULES(CONNMAN,
[
dbus-glib-1
], have_connman="yes", have_connman="no")
if test "x$have_connman" = "xyes"; then
AC_DEFINE(HAVE_CONNMAN, 1, [Define if you have connman dependencies])
fi
else
have_connman=no
PKG_CHECK_MODULES(NETWORK_MANAGER,
[
libnm-glib >= $NETWORK_MANAGER_REQUIRED
], have_nm="yes", have_nm="no")
if test "x$have_nm" = "xyes"; then
AC_DEFINE(HAVE_NM, 1, [Define if you have libnm-glib])
fi
fi
if test "x$with_connectivity" = "xconnman" -a "x$have_connman" != "xyes"; then
AC_MSG_ERROR([Couldn't find connman dependencies:
$CONNMAN_PKG_ERRORS])
fi
if test "x$with_connectivity" = "xnm" -a "x$have_nm" != "xyes"; then
AC_MSG_ERROR([Couldn't find Network Manager dependencies:
$NETWORK_MANAGER_PKG_ERRORS])
fi
AM_CONDITIONAL(HAVE_NM, test "x$have_nm" = "xyes")
AM_CONDITIONAL(HAVE_CONNMAN, test "x$have_connman" = "xyes")
# -----------------------------------------------------------
# gudev
# -----------------------------------------------------------
......@@ -611,10 +559,6 @@ Configure summary:
Cheese webcam support ......: ${have_cheese}
Camera monitoring...........: ${have_gudev}
Connectivity:
NetworkManager integration..: ${have_nm}
ConnMan integration.........: ${have_connman}
Extras:
Nautilus-sendto plugin......: ${have_nst}
GOA MC plugin...............: ${have_goa}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment