--- gvpe/configure 2004/07/07 00:28:19 1.23 +++ gvpe/configure 2005/12/05 12:58:05 1.30 @@ -271,7 +271,7 @@ PACKAGE_STRING= PACKAGE_BUGREPORT= -ac_unique_file="src/vped.C" +ac_unique_file="src/gvpe.C" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -870,12 +870,14 @@ --disable-nls do not use Native Language Support --enable-iftype=TYPE/SUBTYPE Use kernel/net device interface TYPE/SUBTYPE. - Working combinations are: "native/linux" - "tincd/linux" "tincd/freebsd" "tincd/openbsd" + Working combinations are (see doc/gvpe.osdep.5.pod): + "native/linux" "tincd/linux" "tincd/netbsd" + "tincd/freebsd" "tincd/openbsd" "native/darwin" "tincd/darwin" "native/cygwin"; Untested - combinations are: "tincd/netbsd" "tincd/solaris" - "tincd/mingw"; Broken combinations are: - "tincd/cygwin"; The default is to autodetect. + combinations are: "tincd/bsd" "tincd/solaris" + "tincd/mingw" "tincd/raw_socket" "tincd/uml_socket"; + 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). @@ -892,12 +894,12 @@ --enable-max-mtu=BYTES enable mtu sizes upto BYTES bytes (default 1500). Use 9100 for jumbogram support. --disable-compression Disable compression support. - --enable-cipher Select the symmetric cipher (default "bf"). Must be - one of "bf" (blowfish), "aes-128" (rijndael), - "aes-192" or "aes-256". - --enable-digest Select the digets algorithm to use (default "sha1"). - Must be one of "sha1", "ripemd160", "md5" or "md4" - (insecure). + --enable-cipher Select the symmetric cipher (default "aes-128"). + Must be one of "bf" (blowfish), "aes-128" + (rijndael), "aes-192" or "aes-256". + --enable-digest Select the digets algorithm to use (default + "ripemd160"). Must be one of "sha1", "ripemd160", + "md5" or "md4" (insecure). Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1720,7 +1722,7 @@ # Define the identity of the package. PACKAGE=gvpe - VERSION=1.7 + VERSION=1.9 cat >>confdefs.h <<_ACEOF @@ -6416,7 +6418,7 @@ ;; *darwin*) - IFTYPE=tincd + IFTYPE=native IFSUBTYPE=darwin cat >>confdefs.h <<\_ACEOF @@ -7015,7 +7017,8 @@ -for ac_header in ext/hash_map + +for ac_header in ext/hash_map clocale do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -9720,6 +9723,7 @@ fi + # Check whether --enable-icmp or --disable-icmp was given. if test "${enable_icmp+set}" = set; then enableval="$enable_icmp" @@ -9746,11 +9750,230 @@ if test "${enable_dns+set}" = set; then enableval="$enable_dns" + if test "${ac_cv_header_gmp_h+set}" = set; then + echo "$as_me:$LINENO: checking for gmp.h" >&5 +echo $ECHO_N "checking for gmp.h... $ECHO_C" >&6 +if test "${ac_cv_header_gmp_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_gmp_h" >&5 +echo "${ECHO_T}$ac_cv_header_gmp_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking gmp.h usability" >&5 +echo $ECHO_N "checking gmp.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking gmp.h presence" >&5 +echo $ECHO_N "checking gmp.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: gmp.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: gmp.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: gmp.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: gmp.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: gmp.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: gmp.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: gmp.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: gmp.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: gmp.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: gmp.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: gmp.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: gmp.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: gmp.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: gmp.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: gmp.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: gmp.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for gmp.h" >&5 +echo $ECHO_N "checking for gmp.h... $ECHO_C" >&6 +if test "${ac_cv_header_gmp_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_gmp_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_gmp_h" >&5 +echo "${ECHO_T}$ac_cv_header_gmp_h" >&6 + +fi +if test $ac_cv_header_gmp_h = yes; then + : +else + { { echo "$as_me:$LINENO: error: gmp.h not found, required for --enable-dns" >&5 +echo "$as_me: error: gmp.h not found, required for --enable-dns" >&2;} + { (exit 1); exit 1; }; } +fi + + + +echo "$as_me:$LINENO: checking for main in -lgmp" >&5 +echo $ECHO_N "checking for main in -lgmp... $ECHO_C" >&6 +if test "${ac_cv_lib_gmp_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgmp $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + +int +main () +{ +main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gmp_main=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_gmp_main=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_gmp_main" >&5 +echo "${ECHO_T}$ac_cv_lib_gmp_main" >&6 +if test $ac_cv_lib_gmp_main = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBGMP 1 +_ACEOF + + LIBS="-lgmp $LIBS" + +else + { { echo "$as_me:$LINENO: error: libgmp not found, required for --enable-dns" >&5 +echo "$as_me: error: libgmp not found, required for --enable-dns" >&2;} + { (exit 1); exit 1; }; } +fi + + + cat >>confdefs.h <<_ACEOF #define ENABLE_DNS 1 _ACEOF + fi; # Check whether --enable-http-proxy or --disable-http-proxy was given. @@ -9818,7 +10041,7 @@ _ACEOF -CIPHER=bf_cbc +CIPHER=aes_128_cbc # Check whether --enable-cipher or --disable-cipher was given. if test "${enable_cipher+set}" = set; then enableval="$enable_cipher" @@ -9834,7 +10057,7 @@ _ACEOF -DIGEST=sha1 +DIGEST=ripemd160 # Check whether --enable-digest or --disable-digest was given. if test "${enable_digest+set}" = set; then enableval="$enable_digest" @@ -9861,8 +10084,6 @@ - - ac_config_files="$ac_config_files Makefile po/Makefile.in src/Makefile doc/Makefile lib/Makefile m4/Makefile" cat >confcache <<\_ACEOF @@ -11425,6 +11646,27 @@ ac_clean_files=$ac_clean_files_save +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || { (exit 1); exit 1; } +fi + echo echo "***" @@ -11436,7 +11678,10 @@ echo "*** HMAC length: $HMAC" echo "*** RAND used: $RAND" echo "*** Max. MTU: $MTU" -echo "*** Compression: $COMPRESS" + +echo "***" +echo "*** Enable options:" +grep ENABLE_ config.h | sed -e 's/^/*** /' if test "x$DIGEST" = xmd4; then echo "***" @@ -11454,29 +11699,6 @@ fi echo "***" - echo - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } -fi -