From 6416086f149ee7d3f267bd67d3019ef26122c07a Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Wed, 24 Mar 2010 10:24:56 +0000 Subject: Add ConnMan support (words fail me ...) Conflicts: configure.ac modules/Makefile.am --- configure.ac | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 7e88758f1e..3b427e0805 100644 --- a/configure.ac +++ b/configure.ac @@ -1139,9 +1139,20 @@ if test "$enable_nm" = yes; then AC_SUBST(HAVE_NM) AC_SUBST(NM_CFLAGS) fi - AM_CONDITIONAL([ENABLE_NETWORK_MANAGER], [test "$enable_nm" = yes]) +dnl ****************************** +dnl Enable ConnMan support ? +dnl ****************************** +AC_ARG_ENABLE([connman], + [AS_HELP_STRING([--enable-connman], + [enable ConnMan support (default=no)])], + [enable_connman=$enableval],[enable_connman=no]) +if test "x$enable_nm$enable_connman" = "xyesyes"; then + AC_MSG_ERROR([It is not possible to enable both ConnMan and NetworkManager]) +fi +AM_CONDITIONAL([ENABLE_CONNMAN], [test "$enable_connman" = yes]) + dnl ****************************** dnl Camel Flags dnl ****************************** @@ -1690,6 +1701,7 @@ modules/addressbook/Makefile modules/calendar/Makefile modules/mail/Makefile modules/network-manager/Makefile +modules/connman/Makefile modules/plugin-lib/Makefile modules/plugin-mono/Makefile modules/plugin-python/Makefile -- cgit