From: Marcel Holtmann <marcel@holtmann.org>
Date: Mon, 25 May 2009 12:25:58 +0000 (+0100)
Subject: Add support for building Option HSO plugin as builtin
X-Git-Tag: maemo-0.19~27
X-Git-Url: https://vcs.maemo.org/git/?p=connman;a=commitdiff_plain;h=e27ddf5f37f3756bfdfaa4cec8602a5d3323a0d0

Add support for building Option HSO plugin as builtin
---

diff --git a/bootstrap-configure b/bootstrap-configure
index 6e5bfdc..c0d3fca 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -29,7 +29,7 @@ fi
 		--enable-dnsproxy=builtin \
 		--enable-novatel \
 		--enable-huawei \
-		--enable-hso \
+		--enable-hso=builtin \
 		--enable-ppp \
 		--enable-udev \
 		--enable-iwmx \
diff --git a/configure.ac b/configure.ac
index c9a4336..cdf0b09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,9 +152,11 @@ AC_ARG_ENABLE(huawei, AC_HELP_STRING([--enable-huawei],
 		[enable HUAWEI support]), [enable_huawei=${enableval}])
 AM_CONDITIONAL(HUAWEI, test "${enable_huawei}" = "yes")
 
-AC_ARG_ENABLE(hso, AC_HELP_STRING([--enable-hso],
-		[enable HSO support]), [enable_hso=${enableval}])
-AM_CONDITIONAL(HSO, test "${enable_hso}" = "yes")
+AC_ARG_ENABLE(hso,
+	AC_HELP_STRING([--enable-hso], [enable HSO support]),
+			[enable_hso=${enableval}], [enable_hso="no"])
+AM_CONDITIONAL(HSO, test "${enable_hso}" != "no")
+AM_CONDITIONAL(HSO_BUILTIN, test "${enable_hso}" = "builtin")
 
 AC_ARG_WITH(pppd, AC_HELP_STRING([--with-pppd=PROGRAM],
 	[specify location of pppd binary]), [path_pppd=${withval}])
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 07535f7..5688e66 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -74,9 +74,14 @@ huawei_la_SOURCES = huawei.c modem.h modem.c
 endif
 
 if HSO
+if HSO_BUILTIN
+builtin_modules += hso
+builtin_sources += hso.c modem.h modem.c
+else
 plugin_LTLIBRARIES += hso.la
 hso_la_SOURCES = hso.c modem.h modem.c
 endif
+endif
 
 if UDHCP
 if UDHCP_BUILTIN