diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-04-05 19:37:42 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-04-05 21:03:34 +0800 |
| commit | ee4b8cc8d7db207588b33d1762d7e205f7820ca5 (patch) | |
| tree | 5026f26827f42581f0f288b9f82065c3f8f772fe /configure.ac | |
| parent | 384fcd8f440f8d167ff46c5055e31410ade7ec6c (diff) | |
| download | gsoc2013-empathy-ee4b8cc8d7db207588b33d1762d7e205f7820ca5.tar gsoc2013-empathy-ee4b8cc8d7db207588b33d1762d7e205f7820ca5.tar.gz gsoc2013-empathy-ee4b8cc8d7db207588b33d1762d7e205f7820ca5.tar.bz2 gsoc2013-empathy-ee4b8cc8d7db207588b33d1762d7e205f7820ca5.tar.lz gsoc2013-empathy-ee4b8cc8d7db207588b33d1762d7e205f7820ca5.tar.xz gsoc2013-empathy-ee4b8cc8d7db207588b33d1762d7e205f7820ca5.tar.zst gsoc2013-empathy-ee4b8cc8d7db207588b33d1762d7e205f7820ca5.zip | |
configure.ac: remove connectivity libs checks
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/configure.ac b/configure.ac index 76c604b75..28bd0bb9d 100644 --- a/configure.ac +++ b/configure.ac @@ -266,58 +266,6 @@ 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 # ----------------------------------------------------------- AC_ARG_ENABLE(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} |