--- gvpe/configure 2004/01/29 19:22:05 1.15 +++ gvpe/configure 2004/07/07 00:28:19 1.23 @@ -309,7 +309,7 @@ # include #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 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,9 +876,11 @@ 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). + --enable-dns enable dns tunnel protocol support (DOES NOT WORK). --enable-http-proxy enable http proxy connect support (default disabled). --enable-hmac-length=BYTES @@ -1360,6 +1362,7 @@ + ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -1716,8 +1719,8 @@ # Define the identity of the package. - PACKAGE=vpe - VERSION=1.5 + PACKAGE=gvpe + VERSION=1.7 cat >>confdefs.h <<_ACEOF @@ -9677,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" @@ -9684,21 +9695,31 @@ echo echo "**********************************************************************" echo "**********************************************************************" - echo "**** --enable-rohc not yet implemented *******************************" - echo "**********************************************************************" - echo "**** uuh sorry, I am such an ass, but I didn't find any rfc3095 (ROHC)" - echo "**** implementation to be used in GPL code on the web." - echo "**** so this option is just a fake. Please implement one and send it" - echo "**** to me ;)" - echo "**********************************************************************" - echo "**********************************************************************" + echo "**** --enable-rohc is highly experimental, do not use ****************" echo "**********************************************************************" echo "**********************************************************************" echo + rohc=true + +cat >>confdefs.h <<_ACEOF +#define ENABLE_ROHC 1 +_ACEOF + fi; + + +if test x$rohc = xtrue; then + ROHC_TRUE= + ROHC_FALSE='#' +else + ROHC_TRUE='#' + ROHC_FALSE= +fi + + # Check whether --enable-icmp or --disable-icmp was given. if test "${enable_icmp+set}" = set; then enableval="$enable_icmp" @@ -9721,6 +9742,17 @@ fi; +# Check whether --enable-dns or --disable-dns was given. +if test "${enable_dns+set}" = set; then + enableval="$enable_dns" + +cat >>confdefs.h <<_ACEOF +#define ENABLE_DNS 1 +_ACEOF + + +fi; + # Check whether --enable-http-proxy or --disable-http-proxy was given. if test "${enable_http_proxy+set}" = set; then enableval="$enable_http_proxy" @@ -9732,7 +9764,8 @@ fi; -HMAC=8 # 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 @@ -9744,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 @@ -9756,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 @@ -9829,6 +9864,7 @@ ac_config_files="$ac_config_files Makefile po/Makefile.in src/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 @@ -9955,6 +9991,13 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${ROHC_TRUE}" && test -z "${ROHC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"ROHC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"ROHC\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -10579,6 +10622,9 @@ 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 s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t @@ -11399,12 +11445,12 @@ if test "$HMAC" -lt 12; then echo "***" -echo "*** WARNING: The hmac length you have chosen ($HMAC) might be insecure" +echo "*** WARNING: The hmac length you have chosen ($HMAC) is probably insecure" fi if test "$RAND" -lt 8; then echo "***" -echo "*** WARNING: The random prefix you have chosen ($RAND) might be insecure" +echo "*** WARNING: The random prefix you have chosen ($RAND) is probably insecure" fi echo "***"