From 3ee7848c05b19cb1607e532223bfe173ca82e259 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 30 Jul 2012 23:12:37 +0200
Subject: [PATCH] connman: rework configure opts

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/network/connman/build   | 15 ++++++---------
 packages/network/connman/install |  3 +++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/network/connman/build b/packages/network/connman/build
index eca5518fd7..914180d987 100755
--- a/packages/network/connman/build
+++ b/packages/network/connman/build
@@ -25,7 +25,6 @@
 export WPASUPPLICANT="/usr/bin/wpa_supplicant"
 
 cd $PKG_BUILD
-#ac_cv_path_WPASUPPLICANT="/sbin/wpa_supplicant" \
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
@@ -36,30 +35,28 @@ cd $PKG_BUILD
             --disable-gtk-doc \
             --disable-debug \
             --enable-threads \
+            --enable-loopback=builtin \
             --enable-ethernet=builtin \
             --enable-wifi=builtin \
             --disable-bluetooth \
             --disable-hh2serial-gps \
+            --disable-dundee \
+            --disable-wispr \
             --disable-ofono \
             --disable-openconnect \
-            --disable-portal \
             --disable-openvpn \
             --disable-vpnc \
-            --enable-loopback=builtin \
+            --disable-l2tp \
+            --disable-pptp \
+            --disable-tist \
             --disable-pacrunner \
-            --disable-google \
-            --enable-meego=builtin \
             --disable-iwmx \
             --disable-iospm \
-            --enable-ntpd=builtin \
-            --with-ntpd="/usr/sbin/ntpd" \
             --disable-nmcompat \
             --disable-polkit \
             --enable-client \
             --disable-tools \
             --disable-test \
-            --disable-fake \
-            --disable-capng \
             --enable-datafiles \
             --disable-silent-rules \
 
diff --git a/packages/network/connman/install b/packages/network/connman/install
index cc8d024d6a..7c0b9781db 100755
--- a/packages/network/connman/install
+++ b/packages/network/connman/install
@@ -35,6 +35,9 @@ mkdir -p $INSTALL/etc/connman
 mkdir -p $INSTALL/etc/dbus-1/system.d
   cp $PKG_BUILD/src/connman.conf $INSTALL/etc/dbus-1/system.d
 
+mkdir -p $INSTALL/usr/bin
+  cp -P $PKG_BUILD/client/cm $INSTALL/usr/bin
+
 mkdir -p $INSTALL/usr/sbin
   cp -P $PKG_BUILD/src/connmand $INSTALL/usr/sbin