X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=72890d86d3b18f7b86be0c56b79dea8abc555f05;hb=3ca789e446848eed6ca3c00af080cd737d115dcb;hp=39f6dc43077b8d0aaec98c8675b7405e91da1130;hpb=7eab03cc8d9765baceefb679010fae78871949c7;p=framework%2Fconnectivity%2Fconnman.git

diff --git a/configure.ac b/configure.ac
index 39f6dc4..72890d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.60)
-AC_INIT()
+AC_INIT(connman, 1.1)
 
-AM_INIT_AUTOMAKE(connman, 0.19)
+AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
 AM_CONFIG_HEADER(config.h)
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -10,6 +10,8 @@ AM_MAINTAINER_MODE
 
 AC_PREFIX_DEFAULT(/usr/local)
 
+PKG_PROG_PKG_CONFIG
+
 COMPILER_FLAGS
 
 AC_SUBST(abs_top_srcdir)
@@ -21,6 +23,7 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CC_PIE
 AC_PROG_INSTALL
+AM_PROG_MKDIR_P
 
 m4_define([_LT_AC_TAGCONFIG], [])
 m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])])
@@ -28,13 +31,20 @@ m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])])
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
+AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization],
+			[disable code optimization through compiler]), [
+	if (test "${enableval}" = "no"); then
+		CFLAGS="$CFLAGS -O0"
+	fi
+])
+
 GTK_DOC_CHECK
 
 AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],
 			[enable compiling with debugging information]), [
 	if (test "${enableval}" = "yes" &&
 				test "${ac_cv_prog_cc_g}" = "yes"); then
-		CFLAGS="$CFLAGS -g -O0"
+		CFLAGS="$CFLAGS -g"
 	fi
 ])
 
@@ -51,175 +61,129 @@ AC_ARG_ENABLE(threads,
 	AC_HELP_STRING([--enable-threads], [enable threading support]),
 			[enable_threads=${enableval}], [enable_threads="no"])
 
-AC_ARG_ENABLE(loopback,
-	AC_HELP_STRING([--enable-loopback], [enable loopback support]),
-			[enable_loopback=${enableval}], [enable_loopback="no"])
-AM_CONDITIONAL(LOOPBACK, test "${enable_loopback}" != "no")
-AM_CONDITIONAL(LOOPBACK_BUILTIN, test "${enable_loopback}" = "builtin")
-
-AC_ARG_ENABLE(ethernet,
-	AC_HELP_STRING([--enable-ethernet], [enable Ethernet support]),
-			[enable_ethernet=${enableval}], [enable_ethernet="no"])
-AM_CONDITIONAL(ETHERNET, test "${enable_ethernet}" != "no")
-AM_CONDITIONAL(ETHERNET_BUILTIN, test "${enable_ethernet}" = "builtin")
-
-AC_ARG_ENABLE(wifi,
-	AC_HELP_STRING([--enable-wifi], [enable WiFi support]),
-			[enable_wifi=${enableval}], [enable_wifi="no"])
-if (test "${enable_wifi}" != "no"); then
-	AC_PATH_PROG(WPASUPPLICANT, [wpa_supplicant], [],
-						$PATH:/sbin:/usr/sbin)
-fi
-AM_CONDITIONAL(WIFI, test "${enable_wifi}" != "no")
-AM_CONDITIONAL(WIFI_BUILTIN, test "${enable_wifi}" = "builtin")
-
-AC_ARG_ENABLE(bluetooth,
-	AC_HELP_STRING([--enable-bluetooth], [enable Bluetooth support]),
-			[enable_bluetooth=${enableval}], [enable_bluetooth="no"])
-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}" != "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}])
-
-AC_ARG_ENABLE(udhcp,
-	AC_HELP_STRING([--enable-udhcp], [enable uDHCP support]),
-			[enable_udhcp=${enableval}], [enable_udhcp="no"])
-if (test "${enable_udhcp}" != "no"); then
-	if (test -z "${path_udhcpc}"); then
-		AC_PATH_PROG(UDHCPC, [udhcpc], [], $PATH:/sbin:/usr/sbin)
+AC_ARG_ENABLE(hh2serial-gps,
+	AC_HELP_STRING([--enable-hh2serial-gps], [enable hh2serial GPS support]),
+			[enable_hh2serial_gps=${enableval}], [enable_hh2serial_gps="no"])
+AM_CONDITIONAL(HH2SERIAL_GPS, test "${enable_hh2serial_gps}" != "no")
+AM_CONDITIONAL(HH2SERIAL_GPS_BUILTIN, test "${enable_hh2serial_gps}" = "builtin")
+
+AC_ARG_WITH(openconnect, AC_HELP_STRING([--with-openconnect=PROGRAM],
+        [specify location of openconnect binary]), [path_openconnect=${withval}])
+
+AC_ARG_ENABLE(openconnect,
+	AC_HELP_STRING([--enable-openconnect], [enable openconnect support]),
+			[enable_openconnect=${enableval}], [enable_openconnect="no"])
+if (test "${enable_openconnect}" != "no"); then
+	if (test -z "${path_openconnect}"); then
+		AC_PATH_PROG(OPENCONNECT, [openconnect], [], $PATH:/sbin:/usr/sbin)
+		if (test -z "${OPENCONNECT}"); then
+			AC_MSG_ERROR(openconnect binary not found)
+		fi
 	else
-		UDHCPC="${path_udhcpc}"
-		AC_SUBST(UDHCPC)
+		OPENCONNECT="${path_openconnect}"
+		AC_SUBST(OPENCONNECT)
 	fi
 fi
-AM_CONDITIONAL(UDHCP, test "${enable_udhcp}" != "no")
-AM_CONDITIONAL(UDHCP_BUILTIN, test "${enable_udhcp}" = "builtin")
-
-AC_ARG_WITH(dhclient, AC_HELP_STRING([--with-dhclient=PROGRAM],
-	[specify location of dhclient binary]), [path_dhclient=${withval}])
-
-AC_ARG_ENABLE(dhclient,
-	AC_HELP_STRING([--enable-dhclient], [enable dhclient support]),
-			[enable_dhclient=${enableval}], [enable_dhclient="no"])
-if (test "${enable_dhclient}" != "no"); then
-	if (test -z "${path_dhclient}"); then
-		AC_PATH_PROG(DHCLIENT, [dhclient], [], $PATH:/sbin:/usr/sbin)
+AM_CONDITIONAL(OPENCONNECT, test "${enable_openconnect}" != "no")
+AM_CONDITIONAL(OPENCONNECT_BUILTIN, test "${enable_openconnect}" = "builtin")
+
+AC_ARG_WITH(openvpn, AC_HELP_STRING([--with-openvpn=PROGRAM],
+        [specify location of openvpn binary]), [path_openvpn=${withval}])
+
+AC_ARG_ENABLE(openvpn,
+	AC_HELP_STRING([--enable-openvpn], [enable openvpn support]),
+			[enable_openvpn=${enableval}], [enable_openvpn="no"])
+if (test "${enable_openvpn}" != "no"); then
+	if (test -z "${path_openvpn}"); then
+		AC_PATH_PROG(OPENVPN, [openvpn], [], $PATH:/sbin:/usr/sbin)
+		if (test -z "${OPENVPN}"); then
+			AC_MSG_ERROR(openvpn binary not found)
+		fi
 	else
-		DHCLIENT="${path_dhclient}"
-		AC_SUBST(DHCLIENT)
+		OPENVPN="${path_openvpn}"
+		AC_SUBST(OPENVPN)
 	fi
 fi
-AM_CONDITIONAL(DHCLIENT, test "${enable_dhclient}" != "no")
-AM_CONDITIONAL(DHCLIENT_BUILTIN, test "${enable_dhclient}" = "builtin")
-
-AC_ARG_WITH(resolvconf, AC_HELP_STRING([--with-resolvconf=PROGRAM],
-	[specify location of resolvconf binary]), [path_resolvconf=${withval}])
-
-AC_ARG_ENABLE(resolvconf,
-	AC_HELP_STRING([--enable-resolvconf], [enable resolvconf support]),
-			[enable_resolvconf=${enableval}], [enable_resolvconf="no"])
-if (test "${enable_resolvconf}" != "no"); then
-	if (test -z "${path_resolvconf}"); then
-		AC_PATH_PROG(RESOLVCONF, [resolvconf], [], $PATH:/sbin:/usr/sbin)
+AM_CONDITIONAL(OPENVPN, test "${enable_openvpn}" != "no")
+AM_CONDITIONAL(OPENVPN_BUILTIN, test "${enable_openvpn}" = "builtin")
+
+AC_ARG_WITH(vpnc, AC_HELP_STRING([--with-vpnc=PROGRAM],
+	[specify location of vpnc binary]), [path_vpnc=${withval}])
+
+AC_ARG_ENABLE(vpnc,
+	AC_HELP_STRING([--enable-vpnc], [enable vpnc support]),
+		[enable_vpnc=${enableval}], [enable_vpnc="no"])
+if (test "${enable_vpnc}" != "no"); then
+	if (test -z "${path_vpnc}"); then
+		AC_PATH_PROG(VPNC, [vpnc], [], $PATH:/sbin:/usr/sbin)
+		if (test -z "${VPNC}"); then
+			AC_MSG_ERROR(vpnc binary not found)
+		fi
 	else
-		RESOLVCONF="${path_resolvconf}"
-		AC_SUBST(RESOLVCONF)
+		VPNC="${path_vpnc}"
+		AC_SUBST(VPNC)
 	fi
 fi
-AM_CONDITIONAL(RESOLVCONF, test "${enable_resolvconf}" != "no")
-AM_CONDITIONAL(RESOLVCONF_BUILTIN, test "${enable_resolvconf}" = "builtin")
-
-AC_ARG_ENABLE(dnsproxy,
-	AC_HELP_STRING([--enable-dnsproxy], [enable DNS proxy support]),
-			[enable_dnsproxy=${enableval}], [enable_dnsproxy="no"])
-AM_CONDITIONAL(DNSPROXY, test "${enable_dnsproxy}" != "no")
-AM_CONDITIONAL(DNSPROXY_BUILTIN, test "${enable_dnsproxy}" = "builtin")
-
-AC_ARG_ENABLE(novatel, AC_HELP_STRING([--enable-novatel],
-		[enable Novatel support]), [enable_novatel=${enableval}])
-AM_CONDITIONAL(NOVATEL, test "${enable_novatel}" = "yes")
-
-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}], [enable_hso="no"])
-AM_CONDITIONAL(HSO, test "${enable_hso}" != "no")
-AM_CONDITIONAL(HSO_BUILTIN, test "${enable_hso}" = "builtin")
-
-AC_ARG_ENABLE(mbm,
-	AC_HELP_STRING([--enable-mbm], [enable MBM support]),
-			[enable_mbm=${enableval}], [enable_mbm="no"])
-AM_CONDITIONAL(MBM, test "${enable_mbm}" != "no")
-AM_CONDITIONAL(MBM_BUILTIN, test "${enable_mbm}" = "builtin")
-
-AC_ARG_WITH(pppd, AC_HELP_STRING([--with-pppd=PROGRAM],
-	[specify location of pppd binary]), [path_pppd=${withval}])
-
-AC_ARG_ENABLE(ppp, AC_HELP_STRING([--enable-ppp],
-		[enable PPP support]), [enable_ppp=${enableval}])
-if (test "${enable_ppp}" = "yes" || test "${enable_novatel}" = "yes" ||
-					test "${enable_huawei}" = "yes"); then
+AM_CONDITIONAL(VPNC, test "${enable_vpnc}" != "no")
+AM_CONDITIONAL(VPNC_BUILTIN, test "${enable_vpnc}" = "builtin")
+
+AC_ARG_ENABLE(l2tp,
+	AC_HELP_STRING([--enable-l2tp], [enable l2tp support]),
+			[enable_l2tp=${enableval}], [enable_l2tp="no"])
+if (test "${enable_l2tp}" != "no"); then
 	if (test -z "${path_pppd}"); then
-		AC_PATH_PROG(PPPD, [pppd], [], $PATH:/sbin:/usr/sbin)
+		AC_PATH_PROG(PPPD, [pppd], [/usr/sbin/pppd], $PATH:/sbin:/usr/sbin)
 	else
 		PPPD="${path_pppd}"
 		AC_SUBST(PPPD)
 	fi
-	AC_CHECK_HEADERS(pppd/pppd.h, enable_ppp=yes,
-			AC_MSG_ERROR(PPP development files are required))
+	AC_CHECK_HEADERS(pppd/pppd.h, dummy=yes,
+			AC_MSG_ERROR(ppp header files are required))
+	if (test -z "${path_l2tp}"); then
+		AC_PATH_PROG(L2TP, [xl2tpd], [/usr/sbin/xl2tpd], $PATH:/sbin:/usr/sbin)
+	else
+		L2TP="${path_l2tp}"
+		AC_SUBST(L2TP)
+	fi
 fi
-AM_CONDITIONAL(PPPD, test "${enable_ppp}" = "yes")
+AM_CONDITIONAL(L2TP, test "${enable_l2tp}" != "no")
+AM_CONDITIONAL(L2TP_BUILTIN, test "${enable_l2tp}" = "builtin")
 
-AC_CHECK_HEADERS(sys/inotify.h, dummy=yes,
-			AC_MSG_ERROR(inotify header files are required))
+AC_ARG_ENABLE(pptp,
+	AC_HELP_STRING([--enable-pptp], [enable pptp support]),
+			[enable_pptp=${enableval}], [enable_pptp="no"])
+if (test "${enable_pptp}" != "no"); then
+	if (test -z "${path_pppd}"); then
+		AC_PATH_PROG(PPPD, [pppd], [/usr/sbin/pppd], $PATH:/sbin:/usr/sbin)
+	else
+		PPPD="${path_pppd}"
+		AC_SUBST(PPPD)
+	fi
+	AC_CHECK_HEADERS(pppd/pppd.h, dummy=yes,
+			AC_MSG_ERROR(ppp header files are required))
+	if (test -z "${path_pptp}"); then
+		AC_PATH_PROG(PPTP, [pptp], [/usr/sbin/pptp], $PATH:/sbin:/usr/sbin)
+	else
+		PPTP="${path_pptp}"
+		AC_SUBST(PPTP)
+	fi
+fi
+AM_CONDITIONAL(PPTP, test "${enable_pptp}" != "no")
+AM_CONDITIONAL(PPTP_BUILTIN, test "${enable_pptp}" = "builtin")
+
+AC_CHECK_HEADERS(resolv.h, dummy=yes,
+	AC_MSG_ERROR(resolver header files are required))
+AC_CHECK_LIB(resolv, ns_initparse, dummy=yes, [
+	AC_CHECK_LIB(resolv, __ns_initparse, dummy=yes,
+		AC_MSG_ERROR(resolver library support is required))
+])
 
-AC_CHECK_LIB(c, inotify_init, dummy=yes,
-			AC_MSG_ERROR(inotify library support is required))
+AC_CHECK_FUNC(signalfd, dummy=yes,
+			AC_MSG_ERROR(signalfd support is required))
 
 AC_CHECK_LIB(dl, dlopen, dummy=yes,
 			AC_MSG_ERROR(dynamic linking loader is required))
 
-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, 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,
-			[Define to 1 if you need the
-				udev_enumerate_add_match_property() function.]))
-	AC_CHECK_LIB(udev, udev_device_get_parent_with_subsystem_devtype, dummy=yes,
-		AC_DEFINE(NEED_UDEV_DEVICE_GET_PARENT_WITH_SUBSYSTEM_DEVTYPE, 1,
-			[Define to 1 if you need the
-				udev_device_get_parent_with_subsystem_devtype()
-									function.]))
-	UDEV_DATADIR="`$PKG_CONFIG --variable=rulesdir libudev`"
-	if (test -z "${UDEV_DATADIR}"); then
-		UDEV_DATADIR="${sysconfdir}/udev/rules.d"
-	fi
-	AC_SUBST(UDEV_DATADIR)
-fi
-AC_SUBST(UDEV_CFLAGS)
-AC_SUBST(UDEV_LIBS)
-AM_CONDITIONAL(UDEV, test "${enable_udev}" = "yes")
-
 AC_ARG_WITH(iwmxsdk, AC_HELP_STRING([--with-iwmxsdk=PATH],
 						[path to Intel WiMAX SDK]),
 				[pkgconfig_iwmxsdk=${withval}/lib/pkgconfig])
@@ -234,6 +198,47 @@ if (test "${enable_iwmx}" = "yes"); then
 	PKG_CONFIG_PATH=""
 	AC_SUBST(IWMXSDK_CFLAGS)
 	AC_SUBST(IWMXSDK_LIBS)
+
+        # Fix API compat breakage from 1.4 to 1.5...
+        CPPFLAGS_save=$CPPFLAGS
+        CPPFLAGS="$IWMXSDK_CFLAGS $CPPFLAGS"
+        AH_TEMPLATE([HAVE_IWMXSDK_STATUS_IDLE],
+                    [WIMAX_API_DEVICE_STATUS_Connection_Idle is present])
+        AC_CHECK_DECL(WIMAX_API_DEVICE_STATUS_Connection_Idle,
+                      [AC_DEFINE([HAVE_IWMXSDK_STATUS_IDLE], [1], [])],
+                      [],
+                      [[#include <WiMaxType.h>]])
+
+        AH_TEMPLATE([HAVE_WIMAX_API_DEVICE_ID],
+                    [WIMAX_API_DEVICE_ID is present])
+        AC_CHECK_TYPE(WIMAX_API_DEVICE_ID,
+                      [AC_DEFINE([HAVE_WIMAX_API_DEVICE_ID], [1], [])],
+                      [],
+                      [[#include <WiMaxType.h>]])
+
+        AH_TEMPLATE([HAVE_WIMAX_API_HW_DEVICE_ID],
+                    [WIMAX_API_HW_DEVICE_ID is present])
+        AC_CHECK_TYPE(WIMAX_API_HW_DEVICE_ID,
+                      [AC_DEFINE([HAVE_WIMAX_API_HW_DEVICE_ID], [1], [])],
+                      [],
+                      [[#include <WiMaxType.h>]])
+
+        AH_TEMPLATE([HAVE_WIMAX_API_NSP_INFO_EX],
+                    [WIMAX_API_NSP_INFO_EX is present])
+        AC_CHECK_TYPE(WIMAX_API_NSP_INFO_EX,
+                      [AC_DEFINE([HAVE_WIMAX_API_NSP_INFO_EX], [1], [])],
+                      [],
+                      [[#include <WiMaxType.h>] 
+                       [#include <WiMaxTypesEx.h>]])
+
+        AH_TEMPLATE([HAVE_WIMAX_API_CONNECTED_NSP_INFO],
+                    [WIMAX_API_CONNECTED_NSP_INFO is present])
+        AC_CHECK_TYPE(WIMAX_API_CONNECTED_NSP_INFO,
+                      [AC_DEFINE([HAVE_WIMAX_API_CONNECTED_NSP_INFO], [1], [])],
+                      [],
+                      [[#include <WiMaxType.h>]])
+
+        CPPFLAGS=$CPPFLAGS_save
 fi
 AM_CONDITIONAL(IWMX, test "${enable_iwmx}" = "yes")
 
@@ -241,8 +246,25 @@ 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))
+AC_ARG_ENABLE(tist,
+	AC_HELP_STRING([--enable-tist], [enable TI Shared Transport support]),
+			[enable_tist=${enableval}], [enable_tist="no"])
+AM_CONDITIONAL(TIST, test "${enable_tist}" != "no")
+AM_CONDITIONAL(TIST_BUILTIN, test "${enable_tist}" = "builtin")
+
+AC_ARG_WITH(stats-max-file-size, AC_HELP_STRING([--with-stats-max-file-size=SIZE],
+			[Maximal size of a statistics round robin file]),
+			[stats_max_file_size=${withval}])
+
+if (test -z "${stats_max_file_size}"); then
+   # default size is 16 kByte
+   stats_max_file_size="16 * 8 * 128"
+fi
+
+AC_DEFINE_UNQUOTED([STATS_MAX_FILE_SIZE], (${stats_max_file_size}), [Maximal size of a statistics round robin file])
+
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28, dummy=yes,
+				AC_MSG_ERROR(GLib >= 2.28 is required))
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
@@ -254,71 +276,144 @@ if (test "${enable_threads}" = "yes"); then
 	GLIB_LIBS="$GLIB_LIBS $GTHREAD_LIBS"
 fi
 
-PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.0, dummy=yes,
-				AC_MSG_ERROR(D-Bus >= 1.0 is required))
-AC_CHECK_LIB(dbus-1, dbus_watch_get_unix_fd, dummy=yes,
-	AC_DEFINE(NEED_DBUS_WATCH_GET_UNIX_FD, 1,
-		[Define to 1 if you need the dbus_watch_get_unix_fd() function.]))
+PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.4, dummy=yes,
+				AC_MSG_ERROR(D-Bus >= 1.4 is required))
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
-DBUS_DATADIR="`$PKG_CONFIG --variable=sysconfdir dbus-1`"
-if (test -z "{DBUS_DATADIR}"); then
-	DBUS_DATADIR="${sysconfdir}/dbus-1/system.d"
+
+AC_ARG_WITH(dbusconfdir, AC_HELP_STRING([--with-dbusconfdir=PATH],
+	[path to D-Bus config directory]), [path_dbusconf=${withval}],
+		[path_dbusconf="`$PKG_CONFIG --variable=sysconfdir dbus-1`"])
+if (test -z "${path_dbusconf}"); then
+	DBUS_CONFDIR="${sysconfdir}/dbus-1/system.d"
 else
-	DBUS_DATADIR="$DBUS_DATADIR/dbus-1/system.d"
+	DBUS_CONFDIR="${path_dbusconf}/dbus-1/system.d"
+fi
+AC_SUBST(DBUS_CONFDIR)
+
+AC_ARG_WITH(dbusdatadir, AC_HELP_STRING([--with-dbusdatadir=PATH],
+	[path to D-Bus data directory]), [path_dbusdata=${withval}],
+		[path_dbusdata="`$PKG_CONFIG --variable=datadir dbus-1`"])
+if (test -z "${path_dbusdata}"); then
+	DBUS_DATADIR="${datadir}/dbus-1/system-services"
+else
+	DBUS_DATADIR="${path_dbusdata}/dbus-1/system-services"
 fi
 AC_SUBST(DBUS_DATADIR)
 
-AC_SUBST([GDBUS_CFLAGS], ['$(DBUS_CFLAGS) -I$(top_srcdir)/gdbus'])
-AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la $(DBUS_LIBS)'])
+AC_ARG_WITH([systemdunitdir], AC_HELP_STRING([--with-systemdunitdir=DIR],
+	[path to systemd service directory]), [path_systemdunit=${withval}],
+		[path_systemdunit="`$PKG_CONFIG --variable=systemdsystemunitdir systemd`"])
+if (test -n "${path_systemdunit}"); then
+	SYSTEMD_UNITDIR="${path_systemdunit}"
+	AC_SUBST(SYSTEMD_UNITDIR)
+fi
+AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
+
+PKG_CHECK_MODULES(XTABLES, xtables, dummy=yes,
+				AC_MSG_ERROR(Xtables library is required))
+AC_SUBST(XTABLES_CFLAGS)
+AC_SUBST(XTABLES_LIBS)
+
+AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test],
+		[enable test/example scripts]), [enable_test=${enableval}])
+AM_CONDITIONAL(TEST, test "${enable_test}" = "yes")
 
-AC_SUBST([GATCHAT_CFLAGS], ['-I$(top_srcdir)/gatchat'])
-AC_SUBST([GATCHAT_LIBS], ['$(top_builddir)/gatchat/libgatchat.la'])
+AC_ARG_ENABLE(nmcompat, AC_HELP_STRING([--enable-nmcompat],
+				[enable Network Manager support]),
+			[enable_nmcompat=${enableval}], [enable_nmcompat="no"])
+AM_CONDITIONAL(NMCOMPAT, test "${enable_nmcompat}" != "no")
 
-AC_ARG_ENABLE(polkit,
-	AC_HELP_STRING([--enable-polkit], [enable PolicyKit support]),
+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)
-	POLKIT_DATADIR="`$PKG_CONFIG --variable=policydir polkit`"
+	POLKIT_DATADIR="`$PKG_CONFIG --variable=actiondir polkit`"
+	POLKIT_DATADIR=""
 	if (test -z "${POLKIT_DATADIR}"); then
-		POLKIT_DATADIR="${datadir}/PolicyKit/policy"
+		POLKIT_DATADIR="${datadir}/polkit-1/actions"
 	fi
 	AC_SUBST(POLKIT_DATADIR)
 fi
 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}])
-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, dummy=yes,
-				AC_MSG_ERROR(Netlink library is required))
-	AC_SUBST(NETLINK_CFLAGS)
-	AC_SUBST(NETLINK_LIBS)
+
+AC_ARG_ENABLE(loopback, AC_HELP_STRING([--disable-loopback],
+				[disable loopback support]),
+					[enable_loopback=${enableval}])
+AM_CONDITIONAL(LOOPBACK, test "${enable_loopback}" != "no")
+
+AC_ARG_ENABLE(ethernet, AC_HELP_STRING([--disable-ethernet],
+				[disable Ethernet support]),
+					[enable_ethernet=${enableval}])
+AM_CONDITIONAL(ETHERNET, test "${enable_ethernet}" != "no")
+
+AC_ARG_ENABLE(wifi, AC_HELP_STRING([--disable-wifi],
+				[disable WiFi support]),
+					[enable_wifi=${enableval}])
+AM_CONDITIONAL(WIFI, test "${enable_wifi}" != "no")
+
+AC_ARG_ENABLE(bluetooth, AC_HELP_STRING([--disable-bluetooth],
+				[disable Bluetooth support]),
+					[enable_bluetooth=${enableval}])
+AM_CONDITIONAL(BLUETOOTH, test "${enable_bluetooth}" != "no")
+
+AC_ARG_ENABLE(ofono, AC_HELP_STRING([--disable-ofono],
+				[disable oFono support]),
+					[enable_ofono=${enableval}])
+AM_CONDITIONAL(OFONO, test "${enable_ofono}" != "no")
+
+AC_ARG_ENABLE(dundee, AC_HELP_STRING([--disable-dundee],
+				[disable dundee support (Bluetooth DUN)]),
+					[enable_dundee=${enableval}])
+AM_CONDITIONAL(DUNDEE, test "${enable_dundee}" != "no")
+
+AC_ARG_ENABLE(pacrunner, AC_HELP_STRING([--disable-pacrunner],
+				[disable PACrunner support]),
+					[enable_pacrunner=${enableval}])
+AM_CONDITIONAL(PACRUNNER, test "${enable_pacrunner}" != "no")
+
+AC_ARG_ENABLE(wispr, AC_HELP_STRING([--disable-wispr],
+				[disable WISPr support]),
+					[enable_wispr=${enableval}])
+AM_CONDITIONAL(WISPR, test "${enable_wispr}" != "no")
+
+AC_ARG_ENABLE(tools, AC_HELP_STRING([--disable-tools],
+				[disable testing tools]),
+					[enable_tools=${enableval}])
+AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
+
+AC_ARG_ENABLE(client, AC_HELP_STRING([--disable-client],
+				[disable command line client]),
+					[disable_client=${enableval}])
+AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no")
+
+if (test "${enable_wispr}" != "no"); then
+	PKG_CHECK_MODULES(GNUTLS, gnutls, dummy=yes,
+				AC_MSG_ERROR(GnuTLS library is required))
+else
+	GNUTLS_CFLAGS=""
+	GNUTLS_LIBS=""
 fi
-AM_CONDITIONAL(TOOLS, test "${enable_tools}" = "yes")
+AC_SUBST(GNUTLS_CFLAGS)
+AC_SUBST(GNUTLS_LIBS)
 
-AC_ARG_ENABLE(fake, AC_HELP_STRING([--enable-fake],
-		[enable fake device support]), [enable_fake=${enableval}])
-AM_CONDITIONAL(FAKE, test "${enable_fake}" = "yes")
+if (test "${enable_loopback}" != "no"); then
+	AC_CHECK_HEADERS(sys/inotify.h, dummy=yes,
+			AC_MSG_ERROR(inotify header files are required))
+
+	AC_CHECK_LIB(c, inotify_init, dummy=yes,
+			AC_MSG_ERROR(inotify library support is required))
+fi
+
+if (test "${enable_wifi}" != "no"); then
+	AC_PATH_PROG(WPASUPPLICANT, [wpa_supplicant], [],
+						$PATH:/sbin:/usr/sbin)
+fi
 
 AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles],
 			[don't install configuration and data files]),
 					[enable_datafiles=${enableval}])
 AM_CONDITIONAL(DATAFILES, test "${enable_datafiles}" != "no")
 
-AC_OUTPUT(Makefile gdbus/Makefile gatchat/Makefile
-				include/Makefile include/version.h
-				src/Makefile src/connman.service
-				scripts/connman scripts/Makefile
-				plugins/Makefile client/Makefile
-				tools/Makefile test/Makefile
-				doc/Makefile doc/version.xml connman.pc)
+AC_OUTPUT(Makefile include/version.h src/connman.service
+				scripts/connman doc/version.xml connman.pc)