Merged from trunk

diff --cc configure.in
Simple merge

diff --cc helpers/basic_auth/SASL/basic_sasl_auth.cc
index f45f7849ef0b957316c11fdb70f10d5e317976ba,620a1554a2575682e05ca6f6ee42bfcbda902422..51dc6df7cf42920acab78544c3b3cc6d0e5ae5d5
--- 1/helpers/basic_auth/SASL/sasl_auth.c
--- 2/helpers/basic_auth/SASL/basic_sasl_auth.cc
+++ b/helpers/basic_auth/SASL/basic_sasl_auth.cc
@@@ -26,15 -26,23 +26,23 @@@
   *             or with SASL2: gcc -Wall -o sasl_auth sasl_auth.c -lsasl2
   *
   */
+ #include "config.h"
+ #include "rfc1738.h"
+ #include "util.h"
+ 
+ #if HAVE_STDIO_H
  #include <stdio.h>
+ #endif
+ #if HAVE_ERRNO_H
  #include <errno.h>
+ #endif
+ #if HAVE_STDLIB_H
  #include <stdlib.h>
+ #endif
+ #if HAVE_STRING_H
  #include <string.h>
- 
- #include "rfc1738.h"
- #include "util.h"
- 
+ #endif
 -#ifdef HAVE_SASL_SASL_H
 +#if HAVE_SASL_SASL_H
  #include <sasl/sasl.h>
  #else
  #include <sasl.h>

diff --cc src/Makefile.am
Simple merge

diff --cc src/comm.cc
Simple merge

diff --cc src/protos.h
Simple merge