Base Code merged to SPIN 2.4

[platform/upstream/connman.git] / configure.ac

diff --git a/configure.ac b/configure.ac
old mode 100644 (file)
new mode 100755 (executable)
index 08f42dc..35d8f98
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT(connman, 1.26)
+AC_INIT(connman, 1.29)
 
 AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
 AC_CONFIG_HEADERS([config.h])
@@ -67,13 +67,6 @@ AC_ARG_ENABLE(telephony,
 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"
-                               LIBS="$LIBS -lsmack"
-                       fi])
-
 AC_ARG_WITH(openconnect, AC_HELP_STRING([--with-openconnect=PROGRAM],
         [specify location of openconnect binary]), [path_openconnect=${withval}])
 
@@ -134,6 +127,9 @@ fi
 AM_CONDITIONAL(VPNC, test "${enable_vpnc}" != "no")
 AM_CONDITIONAL(VPNC_BUILTIN, test "${enable_vpnc}" = "builtin")
 
+AC_ARG_WITH(l2tp, AC_HELP_STRING([--with-l2tp=PROGRAM],
+        [specify location of l2tp binary]), [path_l2tp=${withval}])
+
 AC_ARG_ENABLE(l2tp,
        AC_HELP_STRING([--enable-l2tp], [enable l2tp support]),
                        [enable_l2tp=${enableval}], [enable_l2tp="no"])
@@ -156,6 +152,9 @@ fi
 AM_CONDITIONAL(L2TP, test "${enable_l2tp}" != "no")
 AM_CONDITIONAL(L2TP_BUILTIN, test "${enable_l2tp}" = "builtin")
 
+AC_ARG_WITH(pptp, AC_HELP_STRING([--with-pptp=PROGRAM],
+        [specify location of pptp binary]), [path_pptp=${withval}])
+
 AC_ARG_ENABLE(pptp,
        AC_HELP_STRING([--enable-pptp], [enable pptp support]),
                        [enable_pptp=${enableval}], [enable_pptp="no"])
@@ -397,6 +396,4 @@ AM_CONDITIONAL(VPN, test "${enable_openconnect}" != "no" -o \
                        "${enable_l2tp}" != "no" -o \
                        "${enable_pptp}" != "no")
 
-AC_OUTPUT(Makefile include/version.h src/connman.service
-               vpn/connman-vpn.service vpn/net.connman.vpn.service
-               scripts/connman connman.pc src/net.connman.service)
+AC_OUTPUT(Makefile include/version.h connman.pc src/connman.service src/connman_tv.service)