--- gvpe/configure	2004/05/12 13:32:12	1.18
+++ gvpe/configure	2004/06/11 15:56:03	1.22
@@ -309,7 +309,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S RANLIB ac_ct_RANLIB IFTYPE IFSUBTYPE CXXCPP ALLOCA LINUX_IF_TUN_H HAVE_TUNTAP ROHC_TRUE ROHC_FALSE INCLUDES LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S RANLIB ac_ct_RANLIB IFTYPE IFSUBTYPE CXXCPP ALLOCA LINUX_IF_TUN_H HAVE_TUNTAP LDFLAGS_DAEMON ROHC_TRUE ROHC_FALSE INCLUDES LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -876,6 +876,7 @@
                           combinations are: "tincd/netbsd" "tincd/solaris"
                           "tincd/mingw"; Broken combinations are:
                           "tincd/cygwin"; The default is to autodetect.
+  --enable-static-daemon  enable statically linked daemon.
   --enable-rohc           enable robust header compression (rfc3095).
   --enable-icmp           enable icmp protocol support (default disabled).
   --enable-tcp            enable tcp protocol support (default disabled).
@@ -1361,6 +1362,7 @@
 
 
 
+
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   if test -f $ac_dir/install-sh; then
@@ -1717,8 +1719,8 @@
 
 
 # Define the identity of the package.
- PACKAGE=vpe
- VERSION=1.6.1
+ PACKAGE=gvpe
+ VERSION=1.7
 
 
 cat >>confdefs.h <<_ACEOF
@@ -9678,6 +9680,14 @@
    CXXFLAGS="$CXXFLAGS -I$openssl_include"
 fi
 
+# Check whether --enable-static-daemon or --disable-static-daemon was given.
+if test "${enable_static_daemon+set}" = set; then
+  enableval="$enable_static_daemon"
+  LDFLAGS_DAEMON=-static
+
+fi;
+
+
 # Check whether --enable-rohc or --disable-rohc was given.
 if test "${enable_rohc+set}" = set; then
   enableval="$enable_rohc"
@@ -9754,7 +9764,8 @@
 
 fi;
 
-HMAC=12    # Check whether --enable-hmac-length or --disable-hmac-length was given.
+HMAC=12
+# Check whether --enable-hmac-length or --disable-hmac-length was given.
 if test "${enable_hmac_length+set}" = set; then
   enableval="$enable_hmac_length"
   HMAC=$enableval
@@ -9766,7 +9777,8 @@
 _ACEOF
 
 
-RAND=8   # Check whether --enable-rand-length or --disable-rand-length was given.
+RAND=8
+# Check whether --enable-rand-length or --disable-rand-length was given.
 if test "${enable_rand_length+set}" = set; then
   enableval="$enable_rand_length"
   RAND=$enableval
@@ -9778,7 +9790,8 @@
 _ACEOF
 
 
-MTU=1500   # Check whether --enable-mtu or --disable-mtu was given.
+MTU=1500
+# Check whether --enable-mtu or --disable-mtu was given.
 if test "${enable_mtu+set}" = set; then
   enableval="$enable_mtu"
   MTU=$enableval
@@ -9851,6 +9864,7 @@
 
 
                                                                       ac_config_files="$ac_config_files Makefile po/Makefile.in src/Makefile src/rohc/Makefile doc/Makefile lib/Makefile m4/Makefile"
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -10609,6 +10623,7 @@
 s,@ALLOCA@,$ALLOCA,;t t
 s,@LINUX_IF_TUN_H@,$LINUX_IF_TUN_H,;t t
 s,@HAVE_TUNTAP@,$HAVE_TUNTAP,;t t
+s,@LDFLAGS_DAEMON@,$LDFLAGS_DAEMON,;t t
 s,@ROHC_TRUE@,$ROHC_TRUE,;t t
 s,@ROHC_FALSE@,$ROHC_FALSE,;t t
 s,@INCLUDES@,$INCLUDES,;t t