X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=2bf7e17d3d140afc3ceb1fc6d459d440c3769038;hb=5ed7094e4994d03c7606f25881918565c81d1c24;hp=32b9d19813edf98ac4e62be7dd433057d9d5dad2;hpb=8f9bb0bc4487aa28ad6cc1ecb3e77eb0b57d8e14;p=framework%2Fconnectivity%2Fconnman.git

diff --git a/configure.ac b/configure.ac
index 32b9d19..2bf7e17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT(connman, 0.77)
+AC_INIT(connman, 0.78.4)
 
 AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
 AM_CONFIG_HEADER(config.h)
@@ -59,17 +59,17 @@ AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie],
 
 AC_ARG_ENABLE(threads,
 	AC_HELP_STRING([--enable-threads], [enable threading support]),
-			[enable_threads=${enableval}], [enable_threads="no"])
+			[enable_threads=${enableval}], [enable_threads="yes"])
 
 AC_ARG_ENABLE(ethernet,
 	AC_HELP_STRING([--enable-ethernet], [enable Ethernet support]),
-			[enable_ethernet=${enableval}], [enable_ethernet="no"])
+			[enable_ethernet=${enableval}], [enable_ethernet="yes"])
 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"])
+			[enable_wifi=${enableval}], [enable_wifi="yes"])
 if (test "${enable_wifi}" != "no"); then
 	AC_PATH_PROG(WPASUPPLICANT, [wpa_supplicant], [],
 						$PATH:/sbin:/usr/sbin)
@@ -95,6 +95,24 @@ AC_ARG_ENABLE(ofono,
 AM_CONDITIONAL(OFONO, test "${enable_ofono}" != "no")
 AM_CONDITIONAL(OFONO_BUILTIN, test "${enable_ofono}" = "builtin")
 
+AC_ARG_ENABLE(telephony,
+	AC_HELP_STRING([--enable-telephony], [enable Telephony support]),
+			[enable_telephony=${enableval}], [enable_telephony="yes"])
+AM_CONDITIONAL(TELEPHONY, test "${enable_telephony}" != "no")
+AM_CONDITIONAL(TELEPHONY_BUILTIN, test "${enable_telephony}" = "builtin")
+
+AC_ARG_ENABLE(tizen-ext, AC_HELP_STRING([--enable-tizen-ext],
+			[enable TIZEN extensions]), [
+	if (test "${enableval}" = "yes"); then
+		CFLAGS="$CFLAGS -DTIZEN_EXT"
+		PKG_CHECK_MODULES(IPTC, libiptc, dummy=yes,
+			AC_MSG_ERROR(libiptc is required for tizen-ext))
+		IPTC_LIBS="$IPTC_LIBS -lip4tc"
+		AC_SUBST(IPTC_CFLAGS)
+		AC_SUBST(IPTC_LIBS)
+	fi
+])
+
 AC_ARG_WITH(openconnect, AC_HELP_STRING([--with-openconnect=PROGRAM],
         [specify location of openconnect binary]), [path_openconnect=${withval}])
 
@@ -104,6 +122,9 @@ AC_ARG_ENABLE(openconnect,
 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
 		OPENCONNECT="${path_openconnect}"
 		AC_SUBST(OPENCONNECT)
@@ -121,6 +142,9 @@ AC_ARG_ENABLE(openvpn,
 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
 		OPENVPN="${path_openvpn}"
 		AC_SUBST(OPENVPN)
@@ -138,6 +162,9 @@ AC_ARG_ENABLE(vpnc,
 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
 		VPNC="${path_vpnc}"
 		AC_SUBST(VPNC)
@@ -146,9 +173,53 @@ fi
 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], [/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_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(L2TP, test "${enable_l2tp}" != "no")
+AM_CONDITIONAL(L2TP_BUILTIN, test "${enable_l2tp}" = "builtin")
+
+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_ARG_ENABLE(loopback,
 	AC_HELP_STRING([--enable-loopback], [enable loopback support]),
-			[enable_loopback=${enableval}], [enable_loopback="no"])
+			[enable_loopback=${enableval}], [enable_loopback="yes"])
 if (test "${enable_loopback}" != "no"); then
 	AC_CHECK_HEADERS(sys/inotify.h, dummy=yes,
 			AC_MSG_ERROR(inotify header files are required))