dev-cpp/libvmime: New ebuild for bug 148250.

svn path=/sunrise/; revision=1283

6 files changed, 1836 insertions, 0 deletions

diff --git a/dev-cpp/libvmime/ChangeLog b/dev-cpp/libvmime/ChangeLog
new file mode 100644
index 000000000..5d59872fc
--- /dev/null
+++ b/dev-cpp/libvmime/ChangeLog
@@ -0,0 +1,8 @@
+# ChangeLog for dev-cpp/libvmime
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  19 Sep 2006; Tiziano Müller <gentoo@dev-zero.ch> +libvmime-0.8.0.ebuild,
+  +files/libvmime-0.8.0-gnutls_ssl-detection.patch, +metadata.xml:
+  New ebuild for bug 148250.
+
diff --git a/dev-cpp/libvmime/Manifest b/dev-cpp/libvmime/Manifest
new file mode 100644
index 000000000..9a45344c7
--- /dev/null
+++ b/dev-cpp/libvmime/Manifest
@@ -0,0 +1,20 @@
+AUX libvmime-0.8.0-gnutls_ssl-detection.patch 55641 RMD160 83164e5ce5fc9fe00015f7dfa0af20bf3b84af04 SHA1 20e8e61c142e9feb3ca1774fa441764d7adcd8e5 SHA256 da849d899db5ff644e9d674ca9279bb78245f61bb60c018c16252209abfa7f62
+MD5 b69dfabd334775c96459204ed7dc891a files/libvmime-0.8.0-gnutls_ssl-detection.patch 55641
+RMD160 83164e5ce5fc9fe00015f7dfa0af20bf3b84af04 files/libvmime-0.8.0-gnutls_ssl-detection.patch 55641
+SHA256 da849d899db5ff644e9d674ca9279bb78245f61bb60c018c16252209abfa7f62 files/libvmime-0.8.0-gnutls_ssl-detection.patch 55641
+DIST libvmime-0.8.0.tar.bz2 454354 RMD160 0e30c69a666c28961534fae26f5d7f87b8cc0f49 SHA1 10621d5252e331939452d42415d3fd201fd1cb25 SHA256 7f1316b35d16e614be756c820cb351cbacfe8c1b8891f64c310d83c9a6b7e930
+EBUILD libvmime-0.8.0.ebuild 1300 RMD160 f4c38663e5c5da3ba4219aee801449bc2ad738fe SHA1 52a84f07cc9cfa9362c33eddb55796f4e3300c28 SHA256 e296f0bd286b9b319679e067d17d41043c87eacf4ac855e25dbe79528c655f9f
+MD5 32ca9e1a56315b05e50881b7b543c7f8 libvmime-0.8.0.ebuild 1300
+RMD160 f4c38663e5c5da3ba4219aee801449bc2ad738fe libvmime-0.8.0.ebuild 1300
+SHA256 e296f0bd286b9b319679e067d17d41043c87eacf4ac855e25dbe79528c655f9f libvmime-0.8.0.ebuild 1300
+MISC ChangeLog 290 RMD160 84b4b1fcb4c6d02deaca56bca12bc272be59d69d SHA1 b39a15a0b1d1df74255b7dee71ccfb038c9a5a5d SHA256 26eccbed77a577fc5c93d1ca3d8fcf315379ebef8470e2ee1febdad1c8b6961c
+MD5 b879c8010260a8125fcda2a1c0aaeefd ChangeLog 290
+RMD160 84b4b1fcb4c6d02deaca56bca12bc272be59d69d ChangeLog 290
+SHA256 26eccbed77a577fc5c93d1ca3d8fcf315379ebef8470e2ee1febdad1c8b6961c ChangeLog 290
+MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
+MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
+RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
+SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
+MD5 5e1334b9395c9d203f433025b7f1b3ae files/digest-libvmime-0.8.0 247
+RMD160 4d99a3af65690ccd9c399cb828ea2570f431cd99 files/digest-libvmime-0.8.0 247
+SHA256 2d04012afc71be980fd7456d6aebbcc356c8b2788cff1529a23cfb138e128790 files/digest-libvmime-0.8.0 247
diff --git a/dev-cpp/libvmime/files/digest-libvmime-0.8.0 b/dev-cpp/libvmime/files/digest-libvmime-0.8.0
new file mode 100644
index 000000000..d1b463f0f
--- /dev/null
+++ b/dev-cpp/libvmime/files/digest-libvmime-0.8.0
@@ -0,0 +1,3 @@
+MD5 935a5d8baea945811a2364b6af4f4c16 libvmime-0.8.0.tar.bz2 454354
+RMD160 0e30c69a666c28961534fae26f5d7f87b8cc0f49 libvmime-0.8.0.tar.bz2 454354
+SHA256 7f1316b35d16e614be756c820cb351cbacfe8c1b8891f64c310d83c9a6b7e930 libvmime-0.8.0.tar.bz2 454354
diff --git a/dev-cpp/libvmime/files/libvmime-0.8.0-gnutls_ssl-detection.patch b/dev-cpp/libvmime/files/libvmime-0.8.0-gnutls_ssl-detection.patch
new file mode 100644
index 000000000..ff393c763
--- /dev/null
+++ b/dev-cpp/libvmime/files/libvmime-0.8.0-gnutls_ssl-detection.patch
@@ -0,0 +1,1744 @@
+--- configure.orig	2006-09-19 22:52:19.000000000 +0200
++++ configure	2006-09-19 22:58:37.000000000 +0200
+@@ -21617,28 +21617,98 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-# -- GNU SASL Library (http://www.gnu.org/software/gsasl/)
++# -- global constructors (stolen from 'configure.in' in libsigc++)
++echo "$as_me:$LINENO: checking if linker supports global constructors" >&5
++echo $ECHO_N "checking if linker supports global constructors... $ECHO_C" >&6
++cat > mylib.$ac_ext <<EOF
++#include <stdio.h>
+ 
+-if test "${ac_cv_header_gsasl_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for gsasl.h" >&5
+-echo $ECHO_N "checking for gsasl.h... $ECHO_C" >&6
+-if test "${ac_cv_header_gsasl_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_gsasl_h" >&5
+-echo "${ECHO_T}$ac_cv_header_gsasl_h" >&6
++struct A
++{
++  A() { printf("PASS\n"); }
++};
++
++A a;
++
++int foo()
++  { return 1; }
++
++EOF
++cat > mytest.$ac_ext <<EOF
++#include <stdio.h>
++
++extern int foo();
++
++int main(int, char**)
++{
++  int i = foo();
++  if(i != 1) printf("FAIL\n");
++  return 0;
++}
++
++EOF
++sh libtool --mode=compile $CXX -c mylib.$ac_ext >&5
++sh libtool --mode=link $CXX -o libtest.la -rpath / -version-info 0 mylib.lo  >&5
++$CXX -c $CFLAGS $CPPFLAGS mytest.$ac_ext >&5
++sh libtool --mode=link $CXX -o mytest mytest.o libtest.la >&5 2>/dev/null
++
++if test -x mytest; then
++	myresult=`./mytest`
++	if test "X$myresult" = "XPASS"; then
++		echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	else
++		echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++		{ { echo "$as_me:$LINENO: error:
++===================================================================
++ERROR: This platform lacks support of construction of global
++objects in shared libraries.
++
++See ftp://rtfm.mit.edu/pub/usenet/news.answers/g++-FAQ/plain
++for details about this problem.  Also for possible solutions
++http://www.informatik.uni-frankfurt.de/~fp/Tcl/tcl-c++/tcl-c++.html
++===================================================================" >&5
++echo "$as_me: error:
++===================================================================
++ERROR: This platform lacks support of construction of global
++objects in shared libraries.
++
++See ftp://rtfm.mit.edu/pub/usenet/news.answers/g++-FAQ/plain
++for details about this problem.  Also for possible solutions
++http://www.informatik.uni-frankfurt.de/~fp/Tcl/tcl-c++/tcl-c++.html
++===================================================================" >&2;}
++   { (exit 1); exit 1; }; }
++	fi
+ else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking gsasl.h usability" >&5
+-echo $ECHO_N "checking gsasl.h usability... $ECHO_C" >&6
++	echo "$as_me:$LINENO: result: unknown" >&5
++echo "${ECHO_T}unknown" >&6
++fi
++rm -f mylib.* mytest.* libtest.la .libs/libtest* mytest .libs/mytest .libs/lt-mytest .libs/mylib.* >&5
++rmdir .libs >&5
++
++# -- const_cast
++echo "$as_me:$LINENO: checking if C++ compiler supports const_cast<> (required)" >&5
++echo $ECHO_N "checking if C++ compiler supports const_cast<> (required)... $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 <gsasl.h>
++
++   class foo;
++
++int
++main ()
++{
++
++   const foo *c=0;
++   foo *c1=const_cast<foo*>(c);
++
++  ;
++  return 0;
++}
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -21661,108 +21731,90 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
++
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++  { { echo "$as_me:$LINENO: error: C++ compiler const_cast<> does not work" >&5
++echo "$as_me: error: C++ compiler const_cast<> does not work" >&2;}
++   { (exit 1); exit 1; }; }
++
+ 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 gsasl.h presence" >&5
+-echo $ECHO_N "checking gsasl.h presence... $ECHO_C" >&6
++# -- dynamic_cast
++echo "$as_me:$LINENO: checking if C++ compiler supports dynamic_cast<> (required)" >&5
++echo $ECHO_N "checking if C++ compiler supports dynamic_cast<> (required)... $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 <gsasl.h>
++
++   class foo { virtual ~foo() { } };
++   class bar : public foo { };
++
++int
++main ()
++{
++
++   foo *c=0;
++   bar *c1=dynamic_cast<bar*>(c);
++
++  ;
++  return 0;
++}
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++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); } >/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
++  (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
++
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++
+ 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: gsasl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: gsasl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: gsasl.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: gsasl.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: gsasl.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: gsasl.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: gsasl.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: gsasl.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: gsasl.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: gsasl.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: gsasl.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: gsasl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: gsasl.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: gsasl.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: gsasl.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: gsasl.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to vincent@vincent-richard.net ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for gsasl.h" >&5
+-echo $ECHO_N "checking for gsasl.h... $ECHO_C" >&6
+-if test "${ac_cv_header_gsasl_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_header_gsasl_h=$ac_header_preproc
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_gsasl_h" >&5
+-echo "${ECHO_T}$ac_cv_header_gsasl_h" >&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++  { { echo "$as_me:$LINENO: error: C++ compiler dynamic_cast<> does not work" >&5
++echo "$as_me: error: C++ compiler dynamic_cast<> does not work" >&2;}
++   { (exit 1); exit 1; }; }
+ 
+ fi
+-if test $ac_cv_header_gsasl_h = yes; then
+-  echo "$as_me:$LINENO: checking for gsasl_check_version in -lgsasl" >&5
+-echo $ECHO_N "checking for gsasl_check_version in -lgsasl... $ECHO_C" >&6
+-if test "${ac_cv_lib_gsasl_gsasl_check_version+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgsasl  $LIBS"
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++# -- mutable
++echo "$as_me:$LINENO: checking if C++ compiler supports mutable (required)" >&5
++echo $ECHO_N "checking if C++ compiler supports mutable (required)... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -21770,24 +21822,24 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char gsasl_check_version ();
++class k {
++        mutable char *c;
++public:
++   void foo() const { c=0; }
++};
++
+ int
+ main ()
+ {
+-gsasl_check_version ();
++
++
+   ;
+   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
++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
+@@ -21800,249 +21852,58 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
++	 { 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_cv_lib_gsasl_gsasl_check_version=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_gsasl_gsasl_check_version=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_gsasl_gsasl_check_version" >&5
+-echo "${ECHO_T}$ac_cv_lib_gsasl_gsasl_check_version" >&6
+-if test $ac_cv_lib_gsasl_gsasl_check_version = yes; then
+-  have_gsasl=yes GSASL_AVAIL_LIBS=-lgsasl
+- GSASL_AVAIL_REQUIRED=libgsasl
+-
+-else
+-  have_gsasl=no
+-fi
+-
+-else
+-  have_gsasl=no
+-fi
+-
+-
+-
+-# -- GNU TLS Library (http://www.gnu.org/software/gnutls/)
+-
+-# Check whether --with-libgnutls-prefix or --without-libgnutls-prefix was given.
+-if test "${with_libgnutls_prefix+set}" = set; then
+-  withval="$with_libgnutls_prefix"
+-  libgnutls_config_prefix="$withval"
+-else
+-  libgnutls_config_prefix=""
+-fi;
+ 
+-  if test x$libgnutls_config_prefix != x ; then
+-     if test x${LIBGNUTLS_CONFIG+set} != xset ; then
+-        LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
+-     fi
+-  fi
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
+ 
+-  # Extract the first word of "libgnutls-config", so it can be a program name with args.
+-set dummy libgnutls-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_path_LIBGNUTLS_CONFIG+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  case $LIBGNUTLS_CONFIG in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_LIBGNUTLS_CONFIG="$LIBGNUTLS_CONFIG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_LIBGNUTLS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-  test -z "$ac_cv_path_LIBGNUTLS_CONFIG" && ac_cv_path_LIBGNUTLS_CONFIG="no"
+-  ;;
+-esac
+-fi
+-LIBGNUTLS_CONFIG=$ac_cv_path_LIBGNUTLS_CONFIG
+ 
+-if test -n "$LIBGNUTLS_CONFIG"; then
+-  echo "$as_me:$LINENO: result: $LIBGNUTLS_CONFIG" >&5
+-echo "${ECHO_T}$LIBGNUTLS_CONFIG" >&6
+-else
+   echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+-fi
+-
+-  min_libgnutls_version=1.2.0
+-  echo "$as_me:$LINENO: checking for libgnutls - version >= $min_libgnutls_version" >&5
+-echo $ECHO_N "checking for libgnutls - version >= $min_libgnutls_version... $ECHO_C" >&6
+-  no_libgnutls=""
+-  if test "$LIBGNUTLS_CONFIG" = "no" ; then
+-    no_libgnutls=yes
+-  else
+-    LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
+-    LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
+-    libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
++  { { echo "$as_me:$LINENO: error: C++ compiler does not support 'mutable'" >&5
++echo "$as_me: error: C++ compiler does not support 'mutable'" >&2;}
++   { (exit 1); exit 1; }; }
+ 
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+-      ac_save_CFLAGS="$CFLAGS"
+-      ac_save_LIBS="$LIBS"
+-      CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
+-      LIBS="$LIBS $LIBGNUTLS_LIBS"
+-      rm -f conf.libgnutlstest
+-      if test "$cross_compiling" = yes; then
+-  echo $ac_n "cross compiling; assumed OK... $ac_c"
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
++# -- namespace
++echo "$as_me:$LINENO: checking if C++ compiler supports name spaces (required)" >&5
++echo $ECHO_N "checking if C++ compiler supports name spaces (required)... $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 <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <gnutls/gnutls.h>
++namespace Check
++  {
++   int i;
++  }
+ 
+ int
+ main ()
+ {
+-    system ("touch conf.libgnutlstest");
+-
+-    if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
+-    {
+-      printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n",
+-             "$libgnutls_config_version", gnutls_check_version(NULL) );
+-      printf("*** was found! If libgnutls-config was correct, then it is best\n");
+-      printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n");
+-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+-      printf("*** required on your system.\n");
+-      printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n");
+-      printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n");
+-      printf("*** before re-running configure\n");
+-    }
+-    else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
+-    {
+-      printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION);
+-      printf("*** library (version %s)\n", gnutls_check_version(NULL) );
+-    }
+-    else
+-    {
+-      if ( gnutls_check_version( "$min_libgnutls_version" ) )
+-      {
+-        return 0;
+-      }
+-     else
+-      {
+-        printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n",
+-                gnutls_check_version(NULL) );
+-        printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n",
+-               "$min_libgnutls_version" );
+-        printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
+-        printf("*** \n");
+-        printf("*** If you have already installed a sufficiently new version, this error\n");
+-        printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n");
+-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+-        printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n");
+-        printf("*** correct copy of libgnutls-config. (In this case, you will have to\n");
+-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+-        printf("*** so that the correct libraries are found at run-time))\n");
+-      }
+-    }
+-  return 1;
+-}
+-
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./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
+-  :
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-no_libgnutls=yes
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-       CFLAGS="$ac_save_CFLAGS"
+-       LIBS="$ac_save_LIBS"
+-  fi
+-
+-  if test "x$no_libgnutls" = x ; then
+-     echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-     have_gnutls=yes
+-  else
+-     if test -f conf.libgnutlstest ; then
+-        :
+-     else
+-        echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-     fi
+-     if test "$LIBGNUTLS_CONFIG" = "no" ; then
+-       echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"
+-       echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in"
+-       echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the"
+-       echo "*** full path to libgnutls-config."
+-     else
+-       if test -f conf.libgnutlstest ; then
+-        :
+-       else
+-          echo "*** Could not run libgnutls test program, checking why..."
+-          CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
+-          LIBS="$LIBS $LIBGNUTLS_LIBS"
+-          cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+ 
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <gnutls/gnutls.h>
++  Check::i=1;
+ 
+-int
+-main ()
+-{
+- return !!gnutls_check_version(NULL);
+   ;
+   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
++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
+@@ -22055,134 +21916,63 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
++	 { 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
+-   echo "*** The test program compiled, but did not run. This usually means"
+-          echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong"
+-          echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your"
+-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+-          echo "*** is required on your system"
+-          echo "***"
+-          echo "*** If you have an old version installed, it is best to remove it, although"
+-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+-          echo "***"
++
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+- echo "*** The test program failed to compile or link. See the file config.log for the"
+-          echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed"
+-          echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"
+-          echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG"
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-          CFLAGS="$ac_save_CFLAGS"
+-          LIBS="$ac_save_LIBS"
+-       fi
+-     fi
+-     LIBGNUTLS_CFLAGS=""
+-     LIBGNUTLS_LIBS=""
+-     have_gnutls=no
+-  fi
+-  rm -f conf.libgnutlstest
+-
+-
+-
+-
+-# -- global constructors (stolen from 'configure.in' in libsigc++)
+-echo "$as_me:$LINENO: checking if linker supports global constructors" >&5
+-echo $ECHO_N "checking if linker supports global constructors... $ECHO_C" >&6
+-cat > mylib.$ac_ext <<EOF
+-#include <stdio.h>
+-
+-struct A
+-{
+-  A() { printf("PASS\n"); }
+-};
+-
+-A a;
+-
+-int foo()
+-  { return 1; }
+ 
+-EOF
+-cat > mytest.$ac_ext <<EOF
+-#include <stdio.h>
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++  { { echo "$as_me:$LINENO: error: C++ compiler does not support 'namespace'" >&5
++echo "$as_me: error: C++ compiler does not support 'namespace'" >&2;}
++   { (exit 1); exit 1; }; }
+ 
+-extern int foo();
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+-int main(int, char**)
+-{
+-  int i = foo();
+-  if(i != 1) printf("FAIL\n");
+-  return 0;
+-}
+ 
+-EOF
+-sh libtool --mode=compile $CXX -c mylib.$ac_ext >&5
+-sh libtool --mode=link $CXX -o libtest.la -rpath / -version-info 0 mylib.lo  >&5
+-$CXX -c $CFLAGS $CPPFLAGS mytest.$ac_ext >&5
+-sh libtool --mode=link $CXX -o mytest mytest.o libtest.la >&5 2>/dev/null
++#
++# Target OS and architecture
++#
+ 
+-if test -x mytest; then
+-	myresult=`./mytest`
+-	if test "X$myresult" = "XPASS"; then
+-		echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-	else
+-		echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-		{ { echo "$as_me:$LINENO: error:
+-===================================================================
+-ERROR: This platform lacks support of construction of global
+-objects in shared libraries.
++VMIME_TARGET_ARCH=${target_cpu}
++VMIME_TARGET_OS=${target_os}
+ 
+-See ftp://rtfm.mit.edu/pub/usenet/news.answers/g++-FAQ/plain
+-for details about this problem.  Also for possible solutions
+-http://www.informatik.uni-frankfurt.de/~fp/Tcl/tcl-c++/tcl-c++.html
+-===================================================================" >&5
+-echo "$as_me: error:
+-===================================================================
+-ERROR: This platform lacks support of construction of global
+-objects in shared libraries.
++#
++# Byte Order
++#
+ 
+-See ftp://rtfm.mit.edu/pub/usenet/news.answers/g++-FAQ/plain
+-for details about this problem.  Also for possible solutions
+-http://www.informatik.uni-frankfurt.de/~fp/Tcl/tcl-c++/tcl-c++.html
+-===================================================================" >&2;}
+-   { (exit 1); exit 1; }; }
+-	fi
++echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
++echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
++if test "${ac_cv_c_bigendian+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-	echo "$as_me:$LINENO: result: unknown" >&5
+-echo "${ECHO_T}unknown" >&6
+-fi
+-rm -f mylib.* mytest.* libtest.la .libs/libtest* mytest .libs/mytest .libs/lt-mytest .libs/mylib.* >&5
+-rmdir .libs >&5
+-
+-# -- const_cast
+-echo "$as_me:$LINENO: checking if C++ compiler supports const_cast<> (required)" >&5
+-echo $ECHO_N "checking if C++ compiler supports const_cast<> (required)... $ECHO_C" >&6
++  # See if sys/param.h defines the BYTE_ORDER macro.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-
+-   class foo;
++#include <sys/types.h>
++#include <sys/param.h>
+ 
+ int
+ main ()
+ {
+-
+-   const foo *c=0;
+-   foo *c1=const_cast<foo*>(c);
++#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
++ bogus endian macros
++#endif
+ 
+   ;
+   return 0;
+@@ -22209,43 +21999,22 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-  { { echo "$as_me:$LINENO: error: C++ compiler const_cast<> does not work" >&5
+-echo "$as_me: error: C++ compiler const_cast<> does not work" >&2;}
+-   { (exit 1); exit 1; }; }
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-# -- dynamic_cast
+-echo "$as_me:$LINENO: checking if C++ compiler supports dynamic_cast<> (required)" >&5
+-echo $ECHO_N "checking if C++ compiler supports dynamic_cast<> (required)... $ECHO_C" >&6
++  # It does; now see whether it defined to BIG_ENDIAN or not.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-
+-   class foo { virtual ~foo() { } };
+-   class bar : public foo { };
++#include <sys/types.h>
++#include <sys/param.h>
+ 
+ int
+ main ()
+ {
+-
+-   foo *c=0;
+-   bar *c1=dynamic_cast<bar*>(c);
++#if BYTE_ORDER != BIG_ENDIAN
++ not big endian
++#endif
+ 
+   ;
+   return 0;
+@@ -22272,45 +22041,38 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-
++  ac_cv_c_bigendian=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-  { { echo "$as_me:$LINENO: error: C++ compiler dynamic_cast<> does not work" >&5
+-echo "$as_me: error: C++ compiler dynamic_cast<> does not work" >&2;}
+-   { (exit 1); exit 1; }; }
+-
++ac_cv_c_bigendian=no
+ fi
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-# -- mutable
+-echo "$as_me:$LINENO: checking if C++ compiler supports mutable (required)" >&5
+-echo $ECHO_N "checking if C++ compiler supports mutable (required)... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
++# It does not; compile a test program.
++if test "$cross_compiling" = yes; then
++  # try to guess the endianness by grepping values into an object file
++  ac_cv_c_bigendian=unknown
++  cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-
+-class k {
+-        mutable char *c;
+-public:
+-   void foo() const { c=0; }
+-};
+-
++short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
++short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
++void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
++short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
++short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
++void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+ int
+ main ()
+ {
+-
+-
++ _ascii (); _ebcdic ();
+   ;
+   return 0;
+ }
+@@ -22336,298 +22098,58 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-
++  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
++  ac_cv_c_bigendian=yes
++fi
++if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
++  if test "$ac_cv_c_bigendian" = unknown; then
++    ac_cv_c_bigendian=no
++  else
++    # finding both strings is unlikely to happen, but who knows?
++    ac_cv_c_bigendian=unknown
++  fi
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-  { { echo "$as_me:$LINENO: error: C++ compiler does not support 'mutable'" >&5
+-echo "$as_me: error: C++ compiler does not support 'mutable'" >&2;}
+-   { (exit 1); exit 1; }; }
+-
+ fi
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-# -- namespace
+-echo "$as_me:$LINENO: checking if C++ compiler supports name spaces (required)" >&5
+-echo $ECHO_N "checking if C++ compiler supports name spaces (required)... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
++else
++  cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-
+-namespace Check
+-  {
+-   int i;
+-  }
+-
+ int
+ main ()
+ {
+-
+-  Check::i=1;
+-
+-  ;
+-  return 0;
++  /* Are we little or big endian?  From Harbison&Steele.  */
++  union
++  {
++    long l;
++    char c[sizeof (long)];
++  } u;
++  u.l = 1;
++  exit (u.c[sizeof (long) - 1] == 1);
+ }
+ _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
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
++  (exit $ac_status); } && { ac_try='./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
+-
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-
++  ac_cv_c_bigendian=no
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-  { { echo "$as_me:$LINENO: error: C++ compiler does not support 'namespace'" >&5
+-echo "$as_me: error: C++ compiler does not support 'namespace'" >&2;}
+-   { (exit 1); exit 1; }; }
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-
+-#
+-# Target OS and architecture
+-#
+-
+-VMIME_TARGET_ARCH=${target_cpu}
+-VMIME_TARGET_OS=${target_os}
+-
+-#
+-# Byte Order
+-#
+-
+-echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
+-if test "${ac_cv_c_bigendian+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  # See if sys/param.h defines the BYTE_ORDER macro.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-#include <sys/param.h>
+-
+-int
+-main ()
+-{
+-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+- bogus endian macros
+-#endif
+-
+-  ;
+-  return 0;
+-}
+-_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
+-  # It does; now see whether it defined to BIG_ENDIAN or not.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-#include <sys/param.h>
+-
+-int
+-main ()
+-{
+-#if BYTE_ORDER != BIG_ENDIAN
+- not big endian
+-#endif
+-
+-  ;
+-  return 0;
+-}
+-_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_cv_c_bigendian=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_c_bigendian=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-# It does not; compile a test program.
+-if test "$cross_compiling" = yes; then
+-  # try to guess the endianness by grepping values into an object file
+-  ac_cv_c_bigendian=unknown
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+-short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
+-short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+-short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+-int
+-main ()
+-{
+- _ascii (); _ebcdic ();
+-  ;
+-  return 0;
+-}
+-_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
+-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
+-  ac_cv_c_bigendian=yes
+-fi
+-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+-  if test "$ac_cv_c_bigendian" = unknown; then
+-    ac_cv_c_bigendian=no
+-  else
+-    # finding both strings is unlikely to happen, but who knows?
+-    ac_cv_c_bigendian=unknown
+-  fi
+-fi
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-int
+-main ()
+-{
+-  /* Are we little or big endian?  From Harbison&Steele.  */
+-  union
+-  {
+-    long l;
+-    char c[sizeof (long)];
+-  } u;
+-  u.l = 1;
+-  exit (u.c[sizeof (long) - 1] == 1);
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./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_c_bigendian=no
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+@@ -24438,36 +23960,254 @@
+ fi;
+ 
+ if test "x$conf_sasl" = "xyes"; then
+-	if test "x$have_gsasl" = "xyes"; then
+ 
++# -- GNU SASL Library (http://www.gnu.org/software/gsasl/)
+ 
+-if true; then
+-  VMIME_HAVE_SASL_SUPPORT_TRUE=
+-  VMIME_HAVE_SASL_SUPPORT_FALSE='#'
+-else
+-  VMIME_HAVE_SASL_SUPPORT_TRUE='#'
+-  VMIME_HAVE_SASL_SUPPORT_FALSE=
++if test "${ac_cv_header_gsasl_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for gsasl.h" >&5
++echo $ECHO_N "checking for gsasl.h... $ECHO_C" >&6
++if test "${ac_cv_header_gsasl_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-
+-		VMIME_HAVE_SASL_SUPPORT=1
+-
+-		GSASL_REQUIRED=${GSASL_AVAIL_REQUIRED}
+-		GSASL_LIBS=${GSASL_AVAIL_LIBS}
+-	else
+-		{ { echo "$as_me:$LINENO: error: can't find an usable version of GNU SASL library" >&5
+-echo "$as_me: error: can't find an usable version of GNU SASL library" >&2;}
+-   { (exit 1); exit 1; }; }
+-	fi
+-else
+-
+-
+-if false; then
+-  VMIME_HAVE_SASL_SUPPORT_TRUE=
+-  VMIME_HAVE_SASL_SUPPORT_FALSE='#'
++echo "$as_me:$LINENO: result: $ac_cv_header_gsasl_h" >&5
++echo "${ECHO_T}$ac_cv_header_gsasl_h" >&6
+ else
+-  VMIME_HAVE_SASL_SUPPORT_TRUE='#'
+-  VMIME_HAVE_SASL_SUPPORT_FALSE=
+-fi
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking gsasl.h usability" >&5
++echo $ECHO_N "checking gsasl.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 <gsasl.h>
++_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 gsasl.h presence" >&5
++echo $ECHO_N "checking gsasl.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 <gsasl.h>
++_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: gsasl.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: gsasl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gsasl.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: gsasl.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: gsasl.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: gsasl.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gsasl.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: gsasl.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gsasl.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: gsasl.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gsasl.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: gsasl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gsasl.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: gsasl.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: gsasl.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: gsasl.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++## ------------------------------------------ ##
++## Report this to vincent@vincent-richard.net ##
++## ------------------------------------------ ##
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for gsasl.h" >&5
++echo $ECHO_N "checking for gsasl.h... $ECHO_C" >&6
++if test "${ac_cv_header_gsasl_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_gsasl_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_gsasl_h" >&5
++echo "${ECHO_T}$ac_cv_header_gsasl_h" >&6
++
++fi
++if test $ac_cv_header_gsasl_h = yes; then
++  echo "$as_me:$LINENO: checking for gsasl_check_version in -lgsasl" >&5
++echo $ECHO_N "checking for gsasl_check_version in -lgsasl... $ECHO_C" >&6
++if test "${ac_cv_lib_gsasl_gsasl_check_version+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lgsasl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char gsasl_check_version ();
++int
++main ()
++{
++gsasl_check_version ();
++  ;
++  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_gsasl_gsasl_check_version=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_gsasl_gsasl_check_version=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_gsasl_gsasl_check_version" >&5
++echo "${ECHO_T}$ac_cv_lib_gsasl_gsasl_check_version" >&6
++if test $ac_cv_lib_gsasl_gsasl_check_version = yes; then
++  have_gsasl=yes GSASL_AVAIL_LIBS=-lgsasl
++ GSASL_AVAIL_REQUIRED=libgsasl
++
++else
++  have_gsasl=no
++fi
++
++else
++  have_gsasl=no
++fi
++
++
++
++
++	if test "x$have_gsasl" = "xyes"; then
++
++
++if true; then
++  VMIME_HAVE_SASL_SUPPORT_TRUE=
++  VMIME_HAVE_SASL_SUPPORT_FALSE='#'
++else
++  VMIME_HAVE_SASL_SUPPORT_TRUE='#'
++  VMIME_HAVE_SASL_SUPPORT_FALSE=
++fi
++
++		VMIME_HAVE_SASL_SUPPORT=1
++
++		GSASL_REQUIRED=${GSASL_AVAIL_REQUIRED}
++		GSASL_LIBS=${GSASL_AVAIL_LIBS}
++	else
++		{ { echo "$as_me:$LINENO: error: can't find an usable version of GNU SASL library" >&5
++echo "$as_me: error: can't find an usable version of GNU SASL library" >&2;}
++   { (exit 1); exit 1; }; }
++	fi
++else
++
++
++if false; then
++  VMIME_HAVE_SASL_SUPPORT_TRUE=
++  VMIME_HAVE_SASL_SUPPORT_FALSE='#'
++else
++  VMIME_HAVE_SASL_SUPPORT_TRUE='#'
++  VMIME_HAVE_SASL_SUPPORT_FALSE=
++fi
+ 
+ 	VMIME_HAVE_SASL_SUPPORT=0
+ 
+@@ -24495,6 +24235,267 @@
+ fi;
+ 
+ if test "x$conf_tls" = "xyes"; then
++
++
++# -- GNU TLS Library (http://www.gnu.org/software/gnutls/)
++
++# Check whether --with-libgnutls-prefix or --without-libgnutls-prefix was given.
++if test "${with_libgnutls_prefix+set}" = set; then
++  withval="$with_libgnutls_prefix"
++  libgnutls_config_prefix="$withval"
++else
++  libgnutls_config_prefix=""
++fi;
++
++  if test x$libgnutls_config_prefix != x ; then
++     if test x${LIBGNUTLS_CONFIG+set} != xset ; then
++        LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
++     fi
++  fi
++
++  # Extract the first word of "libgnutls-config", so it can be a program name with args.
++set dummy libgnutls-config; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_LIBGNUTLS_CONFIG+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $LIBGNUTLS_CONFIG in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_LIBGNUTLS_CONFIG="$LIBGNUTLS_CONFIG" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_LIBGNUTLS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_path_LIBGNUTLS_CONFIG" && ac_cv_path_LIBGNUTLS_CONFIG="no"
++  ;;
++esac
++fi
++LIBGNUTLS_CONFIG=$ac_cv_path_LIBGNUTLS_CONFIG
++
++if test -n "$LIBGNUTLS_CONFIG"; then
++  echo "$as_me:$LINENO: result: $LIBGNUTLS_CONFIG" >&5
++echo "${ECHO_T}$LIBGNUTLS_CONFIG" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  min_libgnutls_version=1.2.0
++  echo "$as_me:$LINENO: checking for libgnutls - version >= $min_libgnutls_version" >&5
++echo $ECHO_N "checking for libgnutls - version >= $min_libgnutls_version... $ECHO_C" >&6
++  no_libgnutls=""
++  if test "$LIBGNUTLS_CONFIG" = "no" ; then
++    no_libgnutls=yes
++  else
++    LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
++    LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
++    libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
++
++
++      ac_save_CFLAGS="$CFLAGS"
++      ac_save_LIBS="$LIBS"
++      CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
++      LIBS="$LIBS $LIBGNUTLS_LIBS"
++      rm -f conf.libgnutlstest
++      if test "$cross_compiling" = yes; then
++  echo $ac_n "cross compiling; assumed OK... $ac_c"
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <gnutls/gnutls.h>
++
++int
++main ()
++{
++    system ("touch conf.libgnutlstest");
++
++    if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
++    {
++      printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n",
++             "$libgnutls_config_version", gnutls_check_version(NULL) );
++      printf("*** was found! If libgnutls-config was correct, then it is best\n");
++      printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n");
++      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
++      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
++      printf("*** required on your system.\n");
++      printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n");
++      printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n");
++      printf("*** before re-running configure\n");
++    }
++    else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
++    {
++      printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION);
++      printf("*** library (version %s)\n", gnutls_check_version(NULL) );
++    }
++    else
++    {
++      if ( gnutls_check_version( "$min_libgnutls_version" ) )
++      {
++        return 0;
++      }
++     else
++      {
++        printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n",
++                gnutls_check_version(NULL) );
++        printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n",
++               "$min_libgnutls_version" );
++        printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
++        printf("*** \n");
++        printf("*** If you have already installed a sufficiently new version, this error\n");
++        printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n");
++        printf("*** being found. The easiest way to fix this is to remove the old version\n");
++        printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n");
++        printf("*** correct copy of libgnutls-config. (In this case, you will have to\n");
++        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
++        printf("*** so that the correct libraries are found at run-time))\n");
++      }
++    }
++  return 1;
++}
++
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./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
++  :
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++no_libgnutls=yes
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++       CFLAGS="$ac_save_CFLAGS"
++       LIBS="$ac_save_LIBS"
++  fi
++
++  if test "x$no_libgnutls" = x ; then
++     echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++     have_gnutls=yes
++  else
++     if test -f conf.libgnutlstest ; then
++        :
++     else
++        echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++     fi
++     if test "$LIBGNUTLS_CONFIG" = "no" ; then
++       echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"
++       echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in"
++       echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the"
++       echo "*** full path to libgnutls-config."
++     else
++       if test -f conf.libgnutlstest ; then
++        :
++       else
++          echo "*** Could not run libgnutls test program, checking why..."
++          CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
++          LIBS="$LIBS $LIBGNUTLS_LIBS"
++          cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <gnutls/gnutls.h>
++
++int
++main ()
++{
++ return !!gnutls_check_version(NULL);
++  ;
++  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
++   echo "*** The test program compiled, but did not run. This usually means"
++          echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong"
++          echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your"
++          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
++          echo "*** is required on your system"
++          echo "***"
++          echo "*** If you have an old version installed, it is best to remove it, although"
++          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
++          echo "***"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ echo "*** The test program failed to compile or link. See the file config.log for the"
++          echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed"
++          echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"
++          echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++          CFLAGS="$ac_save_CFLAGS"
++          LIBS="$ac_save_LIBS"
++       fi
++     fi
++     LIBGNUTLS_CFLAGS=""
++     LIBGNUTLS_LIBS=""
++     have_gnutls=no
++  fi
++  rm -f conf.libgnutlstest
++
+ 	if test "x$have_gnutls" = "xyes"; then
+ 
+ 
diff --git a/dev-cpp/libvmime/libvmime-0.8.0.ebuild b/dev-cpp/libvmime/libvmime-0.8.0.ebuild
new file mode 100644
index 000000000..bb14ce18c
--- /dev/null
+++ b/dev-cpp/libvmime/libvmime-0.8.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils versionator
+
+KEYWORDS="~x86"
+
+DESCRIPTION="A powerful C++ class library for working with MIME messages and Internet messaging services like IMAP, POP or SMTP."
+HOMEPAGE="http://www.vmime.org/"
+SRC_URI="mirror://sourceforge/vmime/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug doc sasl ssl"
+
+CDEPEND="sasl? ( net-libs/libgsasl )
+		ssl? ( net-libs/gnutls )
+		virtual/libiconv"
+DEPEND="${CDEPEND}
+		doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gnutls_ssl-detection.patch"
+}
+
+src_compile() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable sasl) \
+		$(use_enable ssl tls) \
+		--enable-platform-posix \
+		--enable-messaging \
+		--enable-messaging-proto-pop3 \
+		--enable-messaging-proto-smtp \
+		--enable-messaging-proto-imap \
+		--enable-messaging-proto-maildir \
+		--enable-messaging-proto-sendmail \
+		|| die "econf failed"
+	emake || die "emake failed"
+	if use doc ; then
+		doxygen vmime.doxygen || die "doxygen failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	if use doc ; then
+		dohtml doc/html/*
+	fi
+	insinto /usr/share/${PN}
+	doins -r examples
+
+}
diff --git a/dev-cpp/libvmime/metadata.xml b/dev-cpp/libvmime/metadata.xml
new file mode 100644
index 000000000..7e3286984
--- /dev/null
+++ b/dev-cpp/libvmime/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>maintainer-wanted</herd>
+</pkgmetadata>