X-Git-Url: http://git.maemo.org/git/?p=connman;a=blobdiff_plain;f=configure.ac;h=c1b00147fea695d2c25e768af393f5aaac3348e6;hp=9fb15f1b1fa5fc04748eca064903f90a09ca226c;hb=HEAD;hpb=0b1cc2ffd2312cf83a5d8ab21881932610623a8d

diff --git a/configure.ac b/configure.ac
index 9fb15f1..c1b0014 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.60)
 AC_INIT()
 
-AM_INIT_AUTOMAKE(connman, 0.16)
+AM_INIT_AUTOMAKE(connman, 0.19)
 AM_CONFIG_HEADER(config.h)
 
 AM_MAINTAINER_MODE
@@ -13,6 +13,7 @@ COMPILER_FLAGS
 AC_LANG_C
 
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_CC_PIE
 AC_PROG_INSTALL
 
@@ -75,10 +76,17 @@ AC_ARG_ENABLE(bluetooth,
 AM_CONDITIONAL(BLUETOOTH, test "${enable_bluetooth}" != "no")
 AM_CONDITIONAL(BLUETOOTH_BUILTIN, test "${enable_bluetooth}" = "builtin")
 
+AC_ARG_ENABLE(ofono,
+	AC_HELP_STRING([--enable-ofono], [enable oFono support]),
+			[enable_ofono=${enableval}], [enable_ofono="no"])
+AM_CONDITIONAL(OFONO, test "${enable_ofono}" != "no")
+AM_CONDITIONAL(OFONO_BUILTIN, test "${enable_ofono}" = "builtin")
+
 AC_ARG_ENABLE(modemmgr,
 	AC_HELP_STRING([--enable-modemmgr], [enable Modem Manager support]),
 			[enable_modemmgr=${enableval}], [enable_modemmgr="no"])
-AM_CONDITIONAL(MODEMMGR, test "${enable_modemmgr}" = "yes")
+AM_CONDITIONAL(MODEMMGR, test "${enable_modemmgr}" != "no")
+AM_CONDITIONAL(MODEMMGR_BUILTIN, test "${enable_modemmgr}" = "builtin")
 
 AC_ARG_WITH(udhcpc, AC_HELP_STRING([--with-udhcpc=PROGRAM],
 	[specify location of udhcpc binary]), [path_udhcpc=${withval}])
@@ -145,9 +153,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}])
@@ -180,7 +190,7 @@ AC_ARG_ENABLE(udev, AC_HELP_STRING([--enable-udev],
 		[enable udev support]), [enable_udev=${enableval}])
 if (test "${enable_udev}" = "yes"); then
 	AC_DEFINE(HAVE_UDEV, 1, [Define if udev support is available])
-	PKG_CHECK_MODULES(UDEV, libudev >= 129, enable_udev=yes,
+	PKG_CHECK_MODULES(UDEV, libudev >= 129, dummy=yes,
 				AC_MSG_ERROR(udev >= 129 is required))
 	AC_CHECK_LIB(udev, udev_enumerate_add_match_property, dummy=yes,
 		AC_DEFINE(NEED_UDEV_ENUMERATE_ADD_MATCH_PROPERTY, 1,
@@ -201,20 +211,26 @@ AC_SUBST(UDEV_CFLAGS)
 AC_SUBST(UDEV_LIBS)
 AM_CONDITIONAL(UDEV, test "${enable_udev}" = "yes")
 
-AC_ARG_ENABLE(iospm, AC_HELP_STRING([--enable-iospm],
-		[enable Intel OSPM support]), [enable_iospm=${enableval}])
-AM_CONDITIONAL(IOSPM, test "${enable_iospm}" = "yes")
+AC_ARG_WITH(iwmxsdk, AC_HELP_STRING([--with-iwmxsdk=PATH],
+						[path to Intel WiMAX SDK]),
+				[pkgconfig_iwmxsdk=${withval}/lib/pkgconfig])
 
-AC_ARG_ENABLE(iwmxsdk, AC_HELP_STRING([--enable-iwmxsdk],
-		[enable Intel WiMAX support]), [enable_iwmxsdk=${enableval}])
-if (test "${enable_iwmxsdk}" = "yes"); then
+AC_ARG_ENABLE(iwmx, AC_HELP_STRING([--enable-iwmx],
+		[enable Intel WiMAX support]), [enable_iwmx=${enableval}])
+if (test "${enable_iwmx}" = "yes"); then
 	enable_threads="yes"
-	PKG_CHECK_MODULES(IWMXSDK, libiWmxSdk-0, enable_iwmxsdk=yes,
+	export PKG_CONFIG_PATH="${pkgconfig_iwmxsdk}"
+	PKG_CHECK_MODULES(IWMXSDK, libiWmxSdk-0, dummy=yes,
 				AC_MSG_ERROR(Intel WiMAX SDK is required))
+	PKG_CONFIG_PATH=""
 	AC_SUBST(IWMXSDK_CFLAGS)
 	AC_SUBST(IWMXSDK_LIBS)
 fi
-AM_CONDITIONAL(IWMXSDK, test "${enable_iwmxsdk}" = "yes")
+AM_CONDITIONAL(IWMX, test "${enable_iwmx}" = "yes")
+
+AC_ARG_ENABLE(iospm, AC_HELP_STRING([--enable-iospm],
+		[enable Intel OSPM support]), [enable_iospm=${enableval}])
+AM_CONDITIONAL(IOSPM, test "${enable_iospm}" = "yes")
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16, dummy=yes,
 				AC_MSG_ERROR(GLib >= 2.16 is required))
@@ -250,10 +266,11 @@ AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la $(DBUS_LIBS)'])
 AC_SUBST([GATCHAT_CFLAGS], ['-I$(top_srcdir)/gatchat'])
 AC_SUBST([GATCHAT_LIBS], ['$(top_builddir)/gatchat/libgatchat.la'])
 
-AC_ARG_ENABLE(polkit, AC_HELP_STRING([--enable-polkit],
-		[enable PolicyKit support]), [enable_polkit=${enableval}])
-if (test "${enable_polkit}" = "yes"); then
-	PKG_CHECK_MODULES(POLKIT, polkit-dbus >= 0.7, enable_polkit=yes,
+AC_ARG_ENABLE(polkit,
+	AC_HELP_STRING([--enable-polkit], [enable PolicyKit support]),
+			[enable_polkit=${enableval}], [enable_polkit="no"])
+if (test "${enable_polkit}" != "no"); then
+	PKG_CHECK_MODULES(POLKIT, polkit-dbus >= 0.7, dummy=yes,
 				AC_MSG_ERROR(PolicyKit >= 0.7 is required))
 	AC_SUBST(POLKIT_CFLAGS)
 	AC_SUBST(POLKIT_LIBS)
@@ -263,7 +280,8 @@ if (test "${enable_polkit}" = "yes"); then
 	fi
 	AC_SUBST(POLKIT_DATADIR)
 fi
-AM_CONDITIONAL(POLKIT, test "${enable_polkit}" = "yes")
+AM_CONDITIONAL(POLKIT, test "${enable_polkit}" != "no")
+AM_CONDITIONAL(POLKIT_BUILTIN, test "${enable_polkit}" = "builtin")
 
 AC_ARG_ENABLE(client, AC_HELP_STRING([--enable-client],
 		[enable command line client]), [enable_client=${enableval}])
@@ -272,7 +290,7 @@ AM_CONDITIONAL(CLIENT, test "${enable_client}" = "yes")
 AC_ARG_ENABLE(tools, AC_HELP_STRING([--enable-tools],
 		[enable testing tools]), [enable_tools=${enableval}])
 if (test "${enable_tools}" = "yes"); then
-	PKG_CHECK_MODULES(NETLINK, libnl-1, enable_netlink=yes,
+	PKG_CHECK_MODULES(NETLINK, libnl-1, dummy=yes,
 				AC_MSG_ERROR(Netlink library is required))
 	AC_SUBST(NETLINK_CFLAGS)
 	AC_SUBST(NETLINK_LIBS)