Imported Upstream version 1.29upstream/1.29

Change-Id: I2958446c35966d9ed72df0120b80561be7d89f54
Signed-off-by: Taesub Kim <taesub.kim@samsung.com>

1 files changed, 29 insertions, 16 deletions

diff --git a/configure b/configure
index ec36fdc8..ddc65551 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for connman 1.26.
+# Generated by GNU Autoconf 2.69 for connman 1.29.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='connman'
 PACKAGE_TARNAME='connman'
-PACKAGE_VERSION='1.26'
-PACKAGE_STRING='connman 1.26'
+PACKAGE_VERSION='1.29'
+PACKAGE_STRING='connman 1.29'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -868,7 +868,9 @@ with_openvpn
 enable_openvpn
 with_vpnc
 enable_vpnc
+with_l2tp
 enable_l2tp
+with_pptp
 enable_pptp
 enable_iospm
 enable_tist
@@ -1455,7 +1457,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures connman 1.26 to adapt to many kinds of systems.
+\`configure' configures connman 1.29 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1525,7 +1527,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of connman 1.26:";;
+     short | recursive ) echo "Configuration of connman 1.29:";;
    esac
   cat <<\_ACEOF
 
@@ -1588,6 +1590,8 @@ Optional Packages:
                           specify location of openconnect binary
   --with-openvpn=PROGRAM  specify location of openvpn binary
   --with-vpnc=PROGRAM     specify location of vpnc binary
+  --with-l2tp=PROGRAM     specify location of l2tp binary
+  --with-pptp=PROGRAM     specify location of pptp binary
   --with-stats-max-file-size=SIZE
                           Maximal size of a statistics round robin file
   --with-dbusconfdir=PATH path to D-Bus config directory
@@ -1687,7 +1691,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-connman configure 1.26
+connman configure 1.29
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2052,7 +2056,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by connman $as_me 1.26, which was
+It was created by connman $as_me 1.29, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2868,7 +2872,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='connman'
- VERSION='1.26'
+ VERSION='1.29'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12139,6 +12143,13 @@ else
 fi
 
 
+
+# Check whether --with-l2tp was given.
+if test "${with_l2tp+set}" = set; then :
+  withval=$with_l2tp; path_l2tp=${withval}
+fi
+
+
 # Check whether --enable-l2tp was given.
 if test "${enable_l2tp+set}" = set; then :
   enableval=$enable_l2tp; enable_l2tp=${enableval}
@@ -12273,6 +12284,13 @@ else
 fi
 
 
+
+# Check whether --with-pptp was given.
+if test "${with_pptp+set}" = set; then :
+  withval=$with_pptp; path_pptp=${withval}
+fi
+
+
 # Check whether --enable-pptp was given.
 if test "${enable_pptp+set}" = set; then :
   enableval=$enable_pptp; enable_pptp=${enableval}
@@ -13429,7 +13447,7 @@ else
 fi
 
 
-ac_config_files="$ac_config_files 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_config_files="$ac_config_files Makefile include/version.h connman.pc"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -14101,7 +14119,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by connman $as_me 1.26, which was
+This file was extended by connman $as_me 1.29, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14167,7 +14185,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-connman config.status 1.26
+connman config.status 1.29
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -14578,12 +14596,7 @@ do
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "include/version.h") CONFIG_FILES="$CONFIG_FILES include/version.h" ;;
-    "src/connman.service") CONFIG_FILES="$CONFIG_FILES src/connman.service" ;;
-    "vpn/connman-vpn.service") CONFIG_FILES="$CONFIG_FILES vpn/connman-vpn.service" ;;
-    "vpn/net.connman.vpn.service") CONFIG_FILES="$CONFIG_FILES vpn/net.connman.vpn.service" ;;
-    "scripts/connman") CONFIG_FILES="$CONFIG_FILES scripts/connman" ;;
     "connman.pc") CONFIG_FILES="$CONFIG_FILES connman.pc" ;;
-    "src/net.connman.service") CONFIG_FILES="$CONFIG_FILES src/net.connman.service" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac