--- gvpe/configure	2011/03/06 13:49:49	1.46
+++ gvpe/configure	2011/06/21 16:27:32	1.48
@@ -734,6 +734,7 @@
 with_kernel
 with_openssl_include
 with_openssl_lib
+enable_threads
 enable_static_daemon
 enable_icmp
 enable_tcp
@@ -1394,6 +1395,8 @@
                           "tincd/mingw" "tincd/raw_socket" "tincd/uml_socket";
                           Broken combinations are: "tincd/cygwin"; The default
                           is to autodetect.
+  --enable-threads        try to use threads for long-running asynchronous
+                          operations (default enabled).
   --enable-static-daemon  enable statically linked daemon.
   --disable-icmp          enable icmp protocol support (default enabled).
   --disable-tcp           enable tcp protocol support (default enabled).
@@ -8205,9 +8208,9 @@
 
   CPPFLAGS="$tinc_ac_save_CPPFLAGS"
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA1_version in -lcrypto" >&5
-$as_echo_n "checking for SHA1_version in -lcrypto... " >&6; }
-if test "${ac_cv_lib_crypto_SHA1_version+set}" = set; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA1_Init in -lcrypto" >&5
+$as_echo_n "checking for SHA1_Init in -lcrypto... " >&6; }
+if test "${ac_cv_lib_crypto_SHA1_Init+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -8221,27 +8224,27 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char SHA1_version ();
+char SHA1_Init ();
 int
 main ()
 {
-return SHA1_version ();
+return SHA1_Init ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_crypto_SHA1_version=yes
+  ac_cv_lib_crypto_SHA1_Init=yes
 else
-  ac_cv_lib_crypto_SHA1_version=no
+  ac_cv_lib_crypto_SHA1_Init=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_SHA1_version" >&5
-$as_echo "$ac_cv_lib_crypto_SHA1_version" >&6; }
-if test "x$ac_cv_lib_crypto_SHA1_version" = x""yes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_SHA1_Init" >&5
+$as_echo "$ac_cv_lib_crypto_SHA1_Init" >&6; }
+if test "x$ac_cv_lib_crypto_SHA1_Init" = x""yes; then :
   LIBS="$LIBS -lcrypto"
 else
   as_fn_error $? "OpenSSL libraries not found." "$LINENO" 5
@@ -8368,6 +8371,46 @@
    CXXFLAGS="$CXXFLAGS -I$openssl_include"
 fi
 
+# Check whether --enable-threads was given.
+if test "${enable_threads+set}" = set; then :
+  enableval=$enable_threads; try_threads=$enableval
+else
+  try_threads=yes
+
+fi
+
+
+if test "x$try_threads" = xyes; then
+   ac_fn_cxx_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+if test "x$ac_cv_header_pthread_h" = x""yes; then :
+
+      LIBS="$LIBS -lpthread"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pthread.h>
+int
+main ()
+{
+pthread_t id; pthread_create (&id, 0, 0, 0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define ENABLE_PTHREADS 1
+_ACEOF
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+
+fi
+
 # Check whether --enable-static-daemon was given.
 if test "${enable_static_daemon+set}" = set; then :
   enableval=$enable_static_daemon; LDFLAGS_DAEMON=-static
@@ -10191,6 +10234,11 @@
 echo "*** WARNING: The digest you have chosen ($DIGEST) is known to be insecure"
 fi
 
+if test "x$DIGEST" = xmd5; then
+echo "***"
+echo "*** WARNING: The digest you have chosen ($DIGEST) is probably insecure"
+fi
+
 if test "$HMAC" -lt 12; then
 echo "***"
 echo "*** WARNING: The hmac length you have chosen ($HMAC) is probably insecure"