--- libaitrpc/configure	2013/08/22 15:31:09	1.20
+++ libaitrpc/configure	2015/01/21 21:17:04	1.32
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libaitrpc 6.0.
+# Generated by GNU Autoconf 2.69 for libaitrpc 8.0.
 #
 # Report bugs to <misho@elwix.org>.
 #
@@ -580,8 +580,13 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libaitrpc'
 PACKAGE_TARNAME='libaitrpc'
-PACKAGE_VERSION='6.0'
-PACKAGE_STRING='libaitrpc 6.0'
+<<<<<<< configure
+PACKAGE_VERSION='8.0'
+PACKAGE_STRING='libaitrpc 8.0'
+=======
+PACKAGE_VERSION='7.2'
+PACKAGE_STRING='libaitrpc 7.2'
+>>>>>>> 1.31
 PACKAGE_BUGREPORT='misho@elwix.org'
 PACKAGE_URL=''
 
@@ -693,6 +698,8 @@ ac_user_opts='
 enable_option_checking
 enable_debug
 enable_cli_res_zcpy
+enable_tcp_sess_exp
+with_timeout_period
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1243,7 +1250,11 @@ 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 libaitrpc 6.0 to adapt to many kinds of systems.
+<<<<<<< configure
+\`configure' configures libaitrpc 8.0 to adapt to many kinds of systems.
+=======
+\`configure' configures libaitrpc 7.2 to adapt to many kinds of systems.
+>>>>>>> 1.31
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1309,7 +1320,11 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libaitrpc 6.0:";;
+<<<<<<< configure
+     short | recursive ) echo "Configuration of libaitrpc 8.0:";;
+=======
+     short | recursive ) echo "Configuration of libaitrpc 7.2:";;
+>>>>>>> 1.31
    esac
   cat <<\_ACEOF
 
@@ -1319,7 +1334,13 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-debug          Build library with debug information and additional messages
   --enable-cli-res-zcpy   Build library with zero-copy return array from RPC client
+  --enable-tcp_sess_exp   Build library with TCP session expiration
 
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-timeout_period   Build library with TCP timeout period
+
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -1396,7 +1417,11 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libaitrpc configure 6.0
+<<<<<<< configure
+libaitrpc configure 8.0
+=======
+libaitrpc configure 7.2
+>>>>>>> 1.31
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1949,7 +1974,11 @@ 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 libaitrpc $as_me 6.0, which was
+<<<<<<< configure
+It was created by libaitrpc $as_me 8.0, which was
+=======
+It was created by libaitrpc $as_me 7.2, which was
+>>>>>>> 1.31
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3422,8 +3451,8 @@ fi
 
 
 
-CFLAGS="-Wall -O2 -fPIC -I/usr/local/include ${CFLAGS}"
-LDFLAGS="-L/usr/local/lib ${LDFLAGS}"
+CFLAGS="-Wall -O2 -fPIC ${CFLAGS}"
+LDFLAGS="${LDFLAGS}"
 
 # Checks for libraries.
 
@@ -4591,6 +4620,44 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLI_RES_ZC" >&5
 $as_echo "$CLI_RES_ZC" >&6; }
 
+TCP_SESSION_TIMEOUT=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking RPC server can to do expiring for TCP sessions" >&5
+$as_echo_n "checking RPC server can to do expiring for TCP sessions... " >&6; }
+# Check whether --enable-tcp_sess_exp was given.
+if test "${enable_tcp_sess_exp+set}" = set; then :
+  enableval=$enable_tcp_sess_exp;  TCP_SESSION_TIMEOUT=$enableval
+	 	case "$enableval" in
+			yes)
+
+$as_echo "#define TCP_SESSION_TIMEOUT /**/" >>confdefs.h
+
+				;;
+			*)
+				;;
+		esac
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCP_SESSION_TIMEOUT" >&5
+$as_echo "$TCP_SESSION_TIMEOUT" >&6; }
+
+DEF_RPC_TIMEOUT=60
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking RPC server timeout period" >&5
+$as_echo_n "checking RPC server timeout period... " >&6; }
+
+# Check whether --with-timeout_period was given.
+if test "${with_timeout_period+set}" = set; then :
+  withval=$with_timeout_period;  DEF_RPC_TIMEOUT=$withval
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define DEF_RPC_TIMEOUT $DEF_RPC_TIMEOUT
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEF_RPC_TIMEOUT" >&5
+$as_echo "$DEF_RPC_TIMEOUT" >&6; }
+
+
 ac_config_files="$ac_config_files Makefile inc/Makefile lib/Makefile src/Makefile"
 
 cat >confcache <<\_ACEOF
@@ -5099,7 +5166,11 @@ 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 libaitrpc $as_me 6.0, which was
+<<<<<<< configure
+This file was extended by libaitrpc $as_me 8.0, which was
+=======
+This file was extended by libaitrpc $as_me 7.2, which was
+>>>>>>> 1.31
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5161,7 +5232,11 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libaitrpc config.status 6.0
+<<<<<<< configure
+libaitrpc config.status 8.0
+=======
+libaitrpc config.status 7.2
+>>>>>>> 1.31
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"