diff --git a/SOURCES/cyrus-sasl-2.1.21-sizes.patch b/SOURCES/cyrus-sasl-2.1.21-sizes.patch
index 006962b..45f1800 100644
--- a/SOURCES/cyrus-sasl-2.1.21-sizes.patch
+++ b/SOURCES/cyrus-sasl-2.1.21-sizes.patch
@@ -14,8 +14,137 @@ conflicts between 32- and 64-bit architectures.  RFEd as #2829.
  
  IPv6_CHECK_SS_FAMILY()
  IPv6_CHECK_SA_LEN()
---- cyrus-sasl-2.1.21/include/makemd5.c	2003-02-13 14:55:52.000000000 -0500
-+++ cyrus-sasl-2.1.21/include/makemd5.c	2006-05-16 07:45:08.000000000 -0400
+diff -up cyrus-sasl-2.1.26/configure.sizes cyrus-sasl-2.1.26/configure
+--- cyrus-sasl-2.1.26/configure.sizes	2013-11-13 16:40:44.492792539 +0100
++++ cyrus-sasl-2.1.26/configure	2013-11-13 16:40:47.489777836 +0100
+@@ -18166,6 +18166,124 @@ fi
+ 
+ done
+ 
++ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" "
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++"
++if test "x$ac_cv_type_long_long" = xyes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_LONG_LONG 1
++_ACEOF
++
++
++fi
++ac_fn_c_check_type "$LINENO" "int8_t" "ac_cv_type_int8_t" "
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++"
++if test "x$ac_cv_type_int8_t" = xyes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_INT8_T 1
++_ACEOF
++
++
++fi
++ac_fn_c_check_type "$LINENO" "uint8_t" "ac_cv_type_uint8_t" "
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++"
++if test "x$ac_cv_type_uint8_t" = xyes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_UINT8_T 1
++_ACEOF
++
++
++fi
++ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" "
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++"
++if test "x$ac_cv_type_int16_t" = xyes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_INT16_T 1
++_ACEOF
++
++
++fi
++ac_fn_c_check_type "$LINENO" "uint16_t" "ac_cv_type_uint16_t" "
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++"
++if test "x$ac_cv_type_uint16_t" = xyes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_UINT16_T 1
++_ACEOF
++
++
++fi
++ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++"
++if test "x$ac_cv_type_int32_t" = xyes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_INT32_T 1
++_ACEOF
++
++
++fi
++ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++"
++if test "x$ac_cv_type_uint32_t" = xyes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_UINT32_T 1
++_ACEOF
++
++
++fi
++ac_fn_c_check_type "$LINENO" "int64_t" "ac_cv_type_int64_t" "
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++"
++if test "x$ac_cv_type_int64_t" = xyes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_INT64_T 1
++_ACEOF
++
++
++fi
++ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++"
++if test "x$ac_cv_type_uint64_t" = xyes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_UINT64_T 1
++_ACEOF
++
++
++fi
++
+ 
+ 
+ { $as_echo "$as_me:$LINENO: checking whether you have ss_family in struct sockaddr_storage" >&5
+diff -up cyrus-sasl-2.1.26/include/makemd5.c.sizes cyrus-sasl-2.1.26/include/makemd5.c
+--- cyrus-sasl-2.1.26/include/makemd5.c.sizes	2012-01-28 00:31:36.000000000 +0100
++++ cyrus-sasl-2.1.26/include/makemd5.c	2013-11-13 16:22:24.195981512 +0100
 @@ -82,12 +82,19 @@
   */
  
diff --git a/SOURCES/cyrus-sasl-2.1.26-keytab.patch b/SOURCES/cyrus-sasl-2.1.26-keytab.patch
index 2eda613..390b517 100644
--- a/SOURCES/cyrus-sasl-2.1.26-keytab.patch
+++ b/SOURCES/cyrus-sasl-2.1.26-keytab.patch
@@ -25,13 +25,11 @@ diff --git a/plugins/gssapi.c b/plugins/gssapi.c
 index 6be9d23..e6fcf46 100644
 --- a/plugins/gssapi.c
 +++ b/plugins/gssapi.c
-@@ -51,6 +51,10 @@
+@@ -51,6 +51,8 @@
  #include <gssapi/gssapi.h>
  #endif
  
-+#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H
 +#include <gssapi/gssapi_krb5.h>
-+#endif
 +
  #ifdef WIN32
  #  include <winsock2.h>
diff --git a/SOURCES/cyrus-sasl-2.1.26-prefer-SCRAM-SHA-1-over-PLAIN.patch b/SOURCES/cyrus-sasl-2.1.26-prefer-SCRAM-SHA-1-over-PLAIN.patch
new file mode 100644
index 0000000..af88e81
--- /dev/null
+++ b/SOURCES/cyrus-sasl-2.1.26-prefer-SCRAM-SHA-1-over-PLAIN.patch
@@ -0,0 +1,51 @@
+commit 26dcfb2d7176b78e70757aa5d01951a28ca217c7
+Author: Alexey Melnikov <alexey.melnikov@isode.com>
+Date:   Fri Jul 5 16:37:59 2013 +0100
+
+    Treat SCRAM-SHA-1/DIGEST-MD5 as more secure than PLAIN when selecting the best client side SASL mechanism
+    
+    Both SCRAM-SHA-1 & DIGEST-MD5 are lacking SASL_SEC_PASS_CREDENTIALS security
+    flag, which prevented them from being chosen over PLAIN when PLAIN is selected
+    as the best mechanism first. For example the problem can be observed when
+    the server advertises "PLAIN DIGEST-MD5 SCRAM-SHA-1" (PLAIN just has to be
+    returned before SCRAM/DIGEST.)
+    
+    Cyrus SASL bug # 3793
+
+diff --git a/lib/client.c b/lib/client.c
+index 62dfb0b..31fe346 100644
+--- a/lib/client.c
++++ b/lib/client.c
+@@ -658,6 +658,20 @@ _sasl_cbinding_disp(sasl_client_params_t *cparams,
+     return SASL_OK;
+ }
+ 
++static int
++_sasl_are_current_security_flags_worse_then_best(unsigned best_security_flags,
++						 unsigned current_security_flags)
++{
++    /* We don't qualify SASL_SEC_PASS_CREDENTIALS as "secure" flag */
++    best_security_flags &= ~SASL_SEC_PASS_CREDENTIALS;
++
++    if ((current_security_flags ^ best_security_flags) & best_security_flags) {
++	return 1;
++    } else {
++	return 0;
++    }
++}
++
+ /* select a mechanism for a connection
+  *  mechlist      -- mechanisms server has available (punctuation ignored)
+  *  secret        -- optional secret from previous session
+@@ -823,8 +837,9 @@ int sasl_client_start(sasl_conn_t *conn,
+ 	     */
+ 
+ 	    if (bestm &&
+-		((m->m.plug->security_flags ^ bestm->m.plug->security_flags) &
+-		 bestm->m.plug->security_flags)) {
++		_sasl_are_current_security_flags_worse_then_best(
++		    bestm->m.plug->security_flags,
++		    m->m.plug->security_flags)) {
+ 		break;
+ 	    }
+ 
diff --git a/SOURCES/cyrus-sasl-2.1.26-relro.patch b/SOURCES/cyrus-sasl-2.1.26-relro.patch
index 1a260be..f8b6027 100644
--- a/SOURCES/cyrus-sasl-2.1.26-relro.patch
+++ b/SOURCES/cyrus-sasl-2.1.26-relro.patch
@@ -10,6 +10,18 @@ diff -up cyrus-sasl-2.1.26/lib/Makefile.am.relro cyrus-sasl-2.1.26/lib/Makefile.
  libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
  libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR)
  
+diff -up cyrus-sasl-2.1.26/lib/Makefile.in.relro cyrus-sasl-2.1.26/lib/Makefile.in
+--- cyrus-sasl-2.1.26/lib/Makefile.in.relro	2013-11-13 16:55:09.606555125 +0100
++++ cyrus-sasl-2.1.26/lib/Makefile.in	2013-11-13 16:56:43.331096795 +0100
+@@ -330,7 +330,7 @@ common_headers = saslint.h
+ common_sources = auxprop.c canonusr.c checkpw.c client.c common.c config.c external.c md5.c saslutil.c server.c seterror.c dlopen.c ../plugins/plugin_common.c
+ lib_LTLIBRARIES = libsasl2.la
+ libsasl2_la_SOURCES = $(common_sources) $(common_headers)
+-libsasl2_la_LDFLAGS = -version-info $(sasl_version)
++libsasl2_la_LDFLAGS = -Wl,-z,relro -version-info $(sasl_version)
+ libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
+ libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR)
+ @MACOSX_TRUE@framedir = /Library/Frameworks/SASL2.framework
 diff -up cyrus-sasl-2.1.26/plugins/Makefile.am.relro cyrus-sasl-2.1.26/plugins/Makefile.am
 --- cyrus-sasl-2.1.26/plugins/Makefile.am.relro	2012-10-12 16:05:48.000000000 +0200
 +++ cyrus-sasl-2.1.26/plugins/Makefile.am	2013-02-11 14:18:01.749053772 +0100
@@ -22,6 +34,18 @@ diff -up cyrus-sasl-2.1.26/plugins/Makefile.am.relro cyrus-sasl-2.1.26/plugins/M
  
  COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@
  
+diff -up cyrus-sasl-2.1.26/plugins/Makefile.in.relro cyrus-sasl-2.1.26/plugins/Makefile.in
+--- cyrus-sasl-2.1.26/plugins/Makefile.in.relro	2013-11-13 16:57:08.430974081 +0100
++++ cyrus-sasl-2.1.26/plugins/Makefile.in	2013-11-13 16:57:58.911727846 +0100
+@@ -364,7 +364,7 @@ top_srcdir = @top_srcdir@
+ # CURRENT:REVISION:AGE
+ plugin_version = 3:0:0
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
+-AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version)
++AM_LDFLAGS = -Wl,-z,relro -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version)
+ COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@
+ EXTRA_DIST = makeinit.sh NTMakefile
+ noinst_SCRIPTS = makeinit.sh
 diff -up cyrus-sasl-2.1.26/saslauthd/Makefile.am.relro cyrus-sasl-2.1.26/saslauthd/Makefile.am
 --- cyrus-sasl-2.1.26/saslauthd/Makefile.am.relro	2013-02-11 14:18:36.910900647 +0100
 +++ cyrus-sasl-2.1.26/saslauthd/Makefile.am	2013-02-11 14:20:17.336463915 +0100
@@ -33,3 +57,14 @@ diff -up cyrus-sasl-2.1.26/saslauthd/Makefile.am.relro cyrus-sasl-2.1.26/saslaut
  
  testsaslauthd_SOURCES = testsaslauthd.c utils.c
  testsaslauthd_LDADD = @LIB_SOCKET@
+diff -up cyrus-sasl-2.1.26/saslauthd/Makefile.in.relro cyrus-sasl-2.1.26/saslauthd/Makefile.in
+--- cyrus-sasl-2.1.26/saslauthd/Makefile.in.relro	2013-11-13 16:58:13.085659148 +0100
++++ cyrus-sasl-2.1.26/saslauthd/Makefile.in	2013-11-13 16:58:49.679481841 +0100
+@@ -234,6 +234,7 @@ saslauthd_DEPENDENCIES = saslauthd-main.
+ saslauthd_LDADD = @SASL_KRB_LIB@ \
+ 		  @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \
+ 		  @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
++saslauthd_LDFLAGS = -pie -Wl,-z,now
+ 
+ testsaslauthd_SOURCES = testsaslauthd.c utils.c
+ testsaslauthd_LDADD = @LIB_SOCKET@
diff --git a/SOURCES/cyrus-sasl-2.1.26-sql.patch b/SOURCES/cyrus-sasl-2.1.26-sql.patch
new file mode 100644
index 0000000..b7f3db4
--- /dev/null
+++ b/SOURCES/cyrus-sasl-2.1.26-sql.patch
@@ -0,0 +1,2296 @@
+diff -up ./configure.in.sql ./configure.in
+--- ./configure.in.sql	2013-11-14 13:19:19.231000002 +0100
++++ ./configure.in	2013-11-14 14:10:44.728997789 +0100
+@@ -729,7 +729,18 @@ LIB_MYSQL=""
+ 
+ case "$with_mysql" in
+     no) true;;
+-    notfound) AC_WARN([MySQL Library not found]); true;;
++    notfound) 
++     save_LDFLAGS=$LDFLAGS
++     LIB_MYSQL=`mysql_config --libs`
++     LIB_MYSQL="-lmysqlclient"
++     LDFLAGS="$LDFLAGS $LIB_MYSQL"
++     # CPPFLAGS="${CPPFLAGS} `mysql_config --include`"
++     AC_CHECK_LIB(mysqlclient, mysql_select_db,
++           AC_DEFINE(HAVE_MYSQL, [], [Do we have mysql support?]),
++           [AC_WARN([MySQL library mysqlclient does not work])
++            with_mysql=no])
++     LDFLAGS=$save_LDFLAGS
++     ;;
+     *)
+      if test -d ${with_mysql}/lib/mysql; then
+ 	CMU_ADD_LIBPATH_TO(${with_mysql}/lib/mysql, LIB_MYSQL)
+@@ -750,6 +761,8 @@ case "$with_mysql" in
+          CPPFLAGS="${CPPFLAGS} -I${with_mysql}/mysql/include"
+      elif test -d ${with_mysql}/include; then
+          CPPFLAGS="${CPPFLAGS} -I${with_mysql}/include"
++     elif test -d ${prefix}/include/mysql; then
++         CPPFLAGS="${CPPFLAGS} -I${prefix}/include/mysql"
+      else
+          CPPFLAGS="${CPPFLAGS} -I${with_mysql}"
+      fi
+@@ -793,7 +806,17 @@ LIB_PGSQL=""
+ 
+ case "$with_pgsql" in
+     no) true;;
+-    notfound) AC_WARN([PostgreSQL Library not found]); true;;
++    notfound)
++     LIB_PGSQL="-lpq"
++     # CPPFLAGS="${CPPFLAGS} -I`pg_config --includedir`"
++     save_LDFLAGS=$LDFLAGS
++     LDFLAGS="$LDFLAGS $LIB_PGSQL"
++     AC_CHECK_LIB(pq, PQsetdbLogin, AC_DEFINE(HAVE_PGSQL,[],
++         [Do we have Postgres support?]),
++         [AC_WARN([PostgreSQL Library pq does not work])
++          with_pgsql=no])
++     LDFLAGS=$save_LDFLAGS
++     ;;
+     *)
+      if test -d ${with_pgsql}/lib/pgsql; then
+ 	CMU_ADD_LIBPATH_TO(${with_pgsql}/lib/pgsql, LIB_PGSQL)
+@@ -814,6 +837,8 @@ case "$with_pgsql" in
+          CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/pgsql/include"
+      elif test -d ${with_pgsql}/include; then
+          CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include"
++     elif test -d ${prefix}/include; then
++         CPPFLAGS="${CPPFLAGS} -I${prefix}/include"
+      else
+          CPPFLAGS="${CPPFLAGS} -I${with_pgsql}"
+      fi
+diff -up ./configure.sql ./configure
+--- ./configure.sql	2013-11-14 13:19:19.177000002 +0100
++++ ./configure	2013-11-14 14:10:50.848000001 +0100
+@@ -4340,116 +4340,8 @@ $as_echo "$ac_cv___attribute__" >&6; }
+ 
+ 
+    # CMU GUESS RUNPATH SWITCH
+-  { $as_echo "$as_me:$LINENO: checking for runpath switch" >&5
+-$as_echo_n "checking for runpath switch... " >&6; }
+-if test "${andrew_cv_runpath_switch+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-    # first, try -R
+-    SAVE_LDFLAGS="${LDFLAGS}"
+-    LDFLAGS="-R /usr/lib"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  andrew_cv_runpath_switch="-R"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-  	LDFLAGS="-Wl,-rpath,/usr/lib"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  andrew_cv_runpath_switch="-Wl,-rpath,"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	andrew_cv_runpath_switch="none"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-  LDFLAGS="${SAVE_LDFLAGS}"
++    andrew_runpath_switch="none"
+ 
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $andrew_cv_runpath_switch" >&5
+-$as_echo "$andrew_cv_runpath_switch" >&6; }
+ 
+ 
+ # Check whether --with-staticsasl was given.
+@@ -4784,7 +4676,7 @@ test x"$silent" = xyes && libtool_flags=
+ case "$lt_target" in
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 4787 "configure"' > conftest.$ac_ext
++  echo '#line 4679 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -11239,7 +11131,6 @@ $as_echo "$cyrus_krbinclude" >&6; }
+        if test -n "${cyrus_krbinclude}"; then
+          CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}"
+        fi
+-       LDFLAGS="$LDFLAGS -L$krb4/lib"
+     fi
+ 
+     if test "$with_des" != no; then
+@@ -13467,69 +13358,43 @@ _ACEOF
+ fi
+ done
+ 
++  if test "$ac_cv_func_gsskrb5_register_acceptor_identity" = no ; then
+ 
+-for ac_func in gss_decapsulate_token
++for ac_header in gssapi/gssapi_krb5.h
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
++$as_echo_n "checking for $ac_header... " >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   $as_echo_n "(cached) " >&6
++fi
++ac_res=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
++  # Is the header compilable?
++{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
++$as_echo_n "checking $ac_header usability... " >&6; }
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
++$ac_includes_default
++#include <$ac_header>
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -13538,139 +13403,178 @@ $as_echo "$ac_try_echo") >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
++       } && test -s conftest.$ac_objext; then
++  ac_header_compiler=yes
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
++	ac_header_compiler=no
+ fi
+-done
+ 
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++$as_echo "$ac_header_compiler" >&6; }
+ 
+-for ac_func in gss_encapsulate_token
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
++# Is the header present?
++{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
++$as_echo_n "checking $ac_header presence... " >&6; }
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
++#include <$ac_header>
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
++if { (ac_try="$ac_cpp conftest.$ac_ext"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
++  (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
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+        }; then
+-  eval "$as_ac_var=yes"
++  ac_header_preproc=yes
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	eval "$as_ac_var=no"
++  ac_header_preproc=no
+ fi
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
++{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++$as_echo "$ac_header_preproc" >&6; }
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++
++    ;;
++esac
++{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
++$as_echo_n "checking for $ac_header... " >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  $as_echo_n "(cached) " >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
++ac_res=`eval 'as_val=${'$as_ac_Header'}
+ 		 $as_echo "$as_val"'`
+ 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
++
++fi
++as_val=`eval 'as_val=${'$as_ac_Header'}
+ 		 $as_echo "$as_val"'`
+    if test "x$as_val" = x""yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
++
+ done
+ 
++    if test "$ac_cv_header_gssapi_gssapi_krb5_h" = "yes"; then
++      { $as_echo "$as_me:$LINENO: checking whether gsskrb5_register_acceptor_identity is declared" >&5
++$as_echo_n "checking whether gsskrb5_register_acceptor_identity is declared... " >&6; }
++if test "${ac_cv_have_decl_gsskrb5_register_acceptor_identity+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  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 <gssapi/gssapi_krb5.h>
+ 
+-for ac_func in gss_oid_equal
++
++int
++main ()
++{
++#ifndef gsskrb5_register_acceptor_identity
++  (void) gsskrb5_register_acceptor_identity;
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  ac_cv_have_decl_gsskrb5_register_acceptor_identity=yes
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_have_decl_gsskrb5_register_acceptor_identity=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_gsskrb5_register_acceptor_identity" >&5
++$as_echo "$ac_cv_have_decl_gsskrb5_register_acceptor_identity" >&6; }
++if test "x$ac_cv_have_decl_gsskrb5_register_acceptor_identity" = x""yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY 1
++_ACEOF
++
++fi
++
++    fi
++  fi
++
++for ac_func in gss_decapsulate_token
+ do
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+@@ -13770,12 +13674,8 @@ _ACEOF
+ fi
+ done
+ 
+-  LIBS="$cmu_save_LIBS"
+-
+-  cmu_save_LIBS="$LIBS"
+-  LIBS="$LIBS $GSSAPIBASE_LIBS"
+ 
+-for ac_func in gss_get_name_attribute
++for ac_func in gss_encapsulate_token
+ do
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+@@ -13875,20 +13775,14 @@ _ACEOF
+ fi
+ done
+ 
+-  LIBS="$cmu_save_LIBS"
+ 
+-  cmu_save_LIBS="$LIBS"
+-  LIBS="$LIBS $GSSAPIBASE_LIBS"
+-  { $as_echo "$as_me:$LINENO: checking for SPNEGO support in GSSAPI libraries" >&5
+-$as_echo_n "checking for SPNEGO support in GSSAPI libraries... " >&6; }
+-  if test "$cross_compiling" = yes; then
+-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++for ac_func in gss_oid_equal
++do
++as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
++$as_echo_n "checking for $ac_func... " >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++  $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -13896,30 +13790,46 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
+ 
+-#ifdef HAVE_GSSAPI_H
+-#include <gssapi.h>
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
+ #else
+-#include <gssapi/gssapi.h>
++# include <assert.h>
+ #endif
+ 
+-int main(void)
+-{
+-    gss_OID_desc spnego_oid = { 6, (void *) "\x2b\x06\x01\x05\x05\x02" };
+-    gss_OID_set mech_set;
+-    OM_uint32 min_stat;
+-    int have_spnego = 0;
++#undef $ac_func
+ 
+-    if (gss_indicate_mechs(&min_stat, &mech_set) == GSS_S_COMPLETE) {
+-	gss_test_oid_set_member(&min_stat, &spnego_oid, mech_set, &have_spnego);
+-	gss_release_oid_set(&min_stat, &mech_set);
+-    }
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_$ac_func || defined __stub___$ac_func
++choke me
++#endif
+ 
+-    return (!have_spnego);  // 0 = success, 1 = failure
++int
++main ()
++{
++return $ac_func ();
++  ;
++  return 0;
+ }
+-
+ _ACEOF
+-rm -f conftest$ac_exeext
++rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+@@ -13927,63 +13837,259 @@ case "(($ac_try" in
+ esac
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GSS_SPNEGO /**/
+-_ACEOF
+-
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-( exit $ac_status )
+-{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	eval "$as_ac_var=no"
+ fi
++
+ rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
+ fi
++ac_res=`eval 'as_val=${'$as_ac_var'}
++		 $as_echo "$as_val"'`
++	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++as_val=`eval 'as_val=${'$as_ac_var'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+ 
+-
+-  LIBS="$cmu_save_LIBS"
+-
+-else
+-  { $as_echo "$as_me:$LINENO: result: disabled" >&5
+-$as_echo "disabled" >&6; }
+ fi
++done
+ 
++  LIBS="$cmu_save_LIBS"
+ 
++  cmu_save_LIBS="$LIBS"
++  LIBS="$LIBS $GSSAPIBASE_LIBS"
+ 
+-
+-if test "$gssapi" != "no"; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define STATIC_GSSAPIV2 /**/
+-_ACEOF
+-
+-  mutex_default="no"
+-  if test "$gss_impl" = "mit"; then
+-     mutex_default="yes"
+-  fi
+-  { $as_echo "$as_me:$LINENO: checking to use mutexes aroung GSS calls" >&5
+-$as_echo_n "checking to use mutexes aroung GSS calls... " >&6; }
++for ac_func in gss_get_name_attribute
++do
++as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
++$as_echo_n "checking for $ac_func... " >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++  $as_echo_n "(cached) " >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_$ac_func || defined __stub___$ac_func
++choke me
++#endif
++
++int
++main ()
++{
++return $ac_func ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  eval "$as_ac_var=yes"
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	eval "$as_ac_var=no"
++fi
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++ac_res=`eval 'as_val=${'$as_ac_var'}
++		 $as_echo "$as_val"'`
++	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++as_val=`eval 'as_val=${'$as_ac_var'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++done
++
++  LIBS="$cmu_save_LIBS"
++
++  cmu_save_LIBS="$LIBS"
++  LIBS="$LIBS $GSSAPIBASE_LIBS"
++  { $as_echo "$as_me:$LINENO: checking for SPNEGO support in GSSAPI libraries" >&5
++$as_echo_n "checking for SPNEGO support in GSSAPI libraries... " >&6; }
++  if test "$cross_compiling" = yes; then
++  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&5
++$as_echo "$as_me: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_GSSAPI_H
++#include <gssapi.h>
++#else
++#include <gssapi/gssapi.h>
++#endif
++
++int main(void)
++{
++    gss_OID_desc spnego_oid = { 6, (void *) "\x2b\x06\x01\x05\x05\x02" };
++    gss_OID_set mech_set;
++    OM_uint32 min_stat;
++    int have_spnego = 0;
++
++    if (gss_indicate_mechs(&min_stat, &mech_set) == GSS_S_COMPLETE) {
++	gss_test_oid_set_member(&min_stat, &spnego_oid, mech_set, &have_spnego);
++	gss_release_oid_set(&min_stat, &mech_set);
++    }
++
++    return (!have_spnego);  // 0 = success, 1 = failure
++}
++
++_ACEOF
++rm -f conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_GSS_SPNEGO /**/
++_ACEOF
++
++	{ $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++else
++  $as_echo "$as_me: program exited with status $ac_status" >&5
++$as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++{ $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++rm -rf conftest.dSYM
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++
++
++  LIBS="$cmu_save_LIBS"
++
++else
++  { $as_echo "$as_me:$LINENO: result: disabled" >&5
++$as_echo "disabled" >&6; }
++fi
++
++
++
++
++if test "$gssapi" != "no"; then
++
++cat >>confdefs.h <<\_ACEOF
++#define STATIC_GSSAPIV2 /**/
++_ACEOF
++
++  mutex_default="no"
++  if test "$gss_impl" = "mit"; then
++     mutex_default="yes"
++  fi
++  { $as_echo "$as_me:$LINENO: checking to use mutexes aroung GSS calls" >&5
++$as_echo_n "checking to use mutexes aroung GSS calls... " >&6; }
+   # Check whether --enable-gss_mutexes was given.
+ if test "${enable_gss_mutexes+set}" = set; then
+   enableval=$enable_gss_mutexes; use_gss_mutexes=$enableval
+@@ -14246,44 +14352,127 @@ LIB_MYSQL=""
+ 
+ case "$with_mysql" in
+     no) true;;
+-    notfound) { $as_echo "$as_me:$LINENO: WARNING: MySQL Library not found" >&5
+-$as_echo "$as_me: WARNING: MySQL Library not found" >&2;}; true;;
+-    *)
+-     if test -d ${with_mysql}/lib/mysql; then
+-
+-  # this is CMU ADD LIBPATH TO
+-  if test "$andrew_cv_runpath_switch" = "none" ; then
+-	LIB_MYSQL="-L${with_mysql}/lib/mysql ${LIB_MYSQL}"
+-  else
+-	LIB_MYSQL="-L${with_mysql}/lib/mysql ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}/lib/mysql"
+-  fi
+-
+-     elif test -d ${with_mysql}/mysql/lib; then
+-
+-  # this is CMU ADD LIBPATH TO
+-  if test "$andrew_cv_runpath_switch" = "none" ; then
+-	LIB_MYSQL="-L${with_mysql}/mysql/lib ${LIB_MYSQL}"
+-  else
+-	LIB_MYSQL="-L${with_mysql}/mysql/lib ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}/mysql/lib"
+-  fi
+-
+-     elif test -d ${with_mysql}/lib; then
+-
+-  # this is CMU ADD LIBPATH TO
+-  if test "$andrew_cv_runpath_switch" = "none" ; then
+-	LIB_MYSQL="-L${with_mysql}/lib ${LIB_MYSQL}"
+-  else
+-	LIB_MYSQL="-L${with_mysql}/lib ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}/lib"
+-  fi
+-
+-     else
++    notfound)
++     save_LDFLAGS=$LDFLAGS
++     LIB_MYSQL=`mysql_config --libs`
++     LIB_MYSQL="-lmysqlclient"
++     LDFLAGS="$LDFLAGS $LIB_MYSQL"
++     # CPPFLAGS="${CPPFLAGS} `mysql_config --include`"
++     { $as_echo "$as_me:$LINENO: checking for mysql_select_db in -lmysqlclient" >&5
++$as_echo_n "checking for mysql_select_db in -lmysqlclient... " >&6; }
++if test "${ac_cv_lib_mysqlclient_mysql_select_db+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lmysqlclient  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-  # this is CMU ADD LIBPATH TO
+-  if test "$andrew_cv_runpath_switch" = "none" ; then
+-	LIB_MYSQL="-L${with_mysql} ${LIB_MYSQL}"
+-  else
+-	LIB_MYSQL="-L${with_mysql} ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}"
+-  fi
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char mysql_select_db ();
++int
++main ()
++{
++return mysql_select_db ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_lib_mysqlclient_mysql_select_db=yes
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_lib_mysqlclient_mysql_select_db=no
++fi
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_mysql_select_db" >&5
++$as_echo "$ac_cv_lib_mysqlclient_mysql_select_db" >&6; }
++if test "x$ac_cv_lib_mysqlclient_mysql_select_db" = x""yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_MYSQL /**/
++_ACEOF
++
++else
++  { $as_echo "$as_me:$LINENO: WARNING: MySQL library mysqlclient does not work" >&5
++$as_echo "$as_me: WARNING: MySQL library mysqlclient does not work" >&2;}
++            with_mysql=no
++fi
++
++     LDFLAGS=$save_LDFLAGS
++     ;;
++    *)
++     if test -d ${with_mysql}/lib/mysql; then
++
++  # this is CMU ADD LIBPATH TO
++  if test "$andrew_cv_runpath_switch" = "none" ; then
++	LIB_MYSQL="-L${with_mysql}/lib/mysql ${LIB_MYSQL}"
++  else
++	LIB_MYSQL="-L${with_mysql}/lib/mysql ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}/lib/mysql"
++  fi
++
++     elif test -d ${with_mysql}/mysql/lib; then
++
++  # this is CMU ADD LIBPATH TO
++  if test "$andrew_cv_runpath_switch" = "none" ; then
++	LIB_MYSQL="-L${with_mysql}/mysql/lib ${LIB_MYSQL}"
++  else
++	LIB_MYSQL="-L${with_mysql}/mysql/lib ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}/mysql/lib"
++  fi
++
++     elif test -d ${with_mysql}/lib; then
++
++  # this is CMU ADD LIBPATH TO
++  if test "$andrew_cv_runpath_switch" = "none" ; then
++	LIB_MYSQL="-L${with_mysql}/lib ${LIB_MYSQL}"
++  else
++	LIB_MYSQL="-L${with_mysql}/lib ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}/lib"
++  fi
++
++     else
++
++  # this is CMU ADD LIBPATH TO
++  if test "$andrew_cv_runpath_switch" = "none" ; then
++	LIB_MYSQL="-L${with_mysql} ${LIB_MYSQL}"
++  else
++	LIB_MYSQL="-L${with_mysql} ${LIB_MYSQL} $andrew_cv_runpath_switch${with_mysql}"
++  fi
+ 
+      fi
+ 
+@@ -14296,6 +14485,8 @@ $as_echo "$as_me: WARNING: MySQL Library
+          CPPFLAGS="${CPPFLAGS} -I${with_mysql}/mysql/include"
+      elif test -d ${with_mysql}/include; then
+          CPPFLAGS="${CPPFLAGS} -I${with_mysql}/include"
++     elif test -d ${prefix}/include/mysql; then
++         CPPFLAGS="${CPPFLAGS} -I${prefix}/include/mysql"
+      else
+          CPPFLAGS="${CPPFLAGS} -I${with_mysql}"
+      fi
+@@ -14416,8 +14607,90 @@ LIB_PGSQL=""
+ 
+ case "$with_pgsql" in
+     no) true;;
+-    notfound) { $as_echo "$as_me:$LINENO: WARNING: PostgreSQL Library not found" >&5
+-$as_echo "$as_me: WARNING: PostgreSQL Library not found" >&2;}; true;;
++    notfound)
++     LIB_PGSQL="-lpq"
++     # CPPFLAGS="${CPPFLAGS} -I`pg_config --includedir`"
++     save_LDFLAGS=$LDFLAGS
++     LDFLAGS="$LDFLAGS $LIB_PGSQL"
++     { $as_echo "$as_me:$LINENO: checking for PQsetdbLogin in -lpq" >&5
++$as_echo_n "checking for PQsetdbLogin in -lpq... " >&6; }
++if test "${ac_cv_lib_pq_PQsetdbLogin+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lpq  $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 GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char PQsetdbLogin ();
++int
++main ()
++{
++return PQsetdbLogin ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_lib_pq_PQsetdbLogin=yes
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_lib_pq_PQsetdbLogin=no
++fi
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsetdbLogin" >&5
++$as_echo "$ac_cv_lib_pq_PQsetdbLogin" >&6; }
++if test "x$ac_cv_lib_pq_PQsetdbLogin" = x""yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_PGSQL /**/
++_ACEOF
++
++else
++  { $as_echo "$as_me:$LINENO: WARNING: PostgreSQL Library pq does not work" >&5
++$as_echo "$as_me: WARNING: PostgreSQL Library pq does not work" >&2;}
++          with_pgsql=no
++fi
++
++     LDFLAGS=$save_LDFLAGS
++     ;;
+     *)
+      if test -d ${with_pgsql}/lib/pgsql; then
+ 
+@@ -14466,6 +14739,8 @@ $as_echo "$as_me: WARNING: PostgreSQL Li
+          CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/pgsql/include"
+      elif test -d ${with_pgsql}/include; then
+          CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include"
++     elif test -d ${prefix}/include; then
++         CPPFLAGS="${CPPFLAGS} -I${prefix}/include"
+      else
+          CPPFLAGS="${CPPFLAGS} -I${with_pgsql}"
+      fi
+@@ -18166,116 +18441,989 @@ fi
+ 
+ done
+ 
+-ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" "
+-#ifdef HAVE_INTTYPES_H
+-#include <inttypes.h>
+-#endif
+-"
+-if test "x$ac_cv_type_long_long" = xyes; then :
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_LONG_LONG 1
++{ $as_echo "$as_me:$LINENO: checking for long long" >&5
++$as_echo_n "checking for long long... " >&6; }
++if test "${ac_cv_type_long_long+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  ac_cv_type_long_long=no
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
+ _ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-
+-fi
+-ac_fn_c_check_type "$LINENO" "int8_t" "ac_cv_type_int8_t" "
+ #ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
+ #endif
+-"
+-if test "x$ac_cv_type_int8_t" = xyes; then :
+ 
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_INT8_T 1
++int
++main ()
++{
++if (sizeof (long long))
++       return 0;
++  ;
++  return 0;
++}
+ _ACEOF
+-
+-
+-fi
+-ac_fn_c_check_type "$LINENO" "uint8_t" "ac_cv_type_uint8_t" "
+-#ifdef HAVE_INTTYPES_H
+-#include <inttypes.h>
+-#endif
+-"
+-if test "x$ac_cv_type_uint8_t" = xyes; then :
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_UINT8_T 1
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
+ _ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-
+-fi
+-ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" "
+ #ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
+ #endif
+-"
+-if test "x$ac_cv_type_int16_t" = xyes; then :
+ 
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_INT16_T 1
++int
++main ()
++{
++if (sizeof ((long long)))
++	  return 0;
++  ;
++  return 0;
++}
+ _ACEOF
+-
+-
+-fi
+-ac_fn_c_check_type "$LINENO" "uint16_t" "ac_cv_type_uint16_t" "
+-#ifdef HAVE_INTTYPES_H
+-#include <inttypes.h>
+-#endif
+-"
+-if test "x$ac_cv_type_uint16_t" = xyes; then :
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_UINT16_T 1
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  :
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_long_long=yes
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
++$as_echo "$ac_cv_type_long_long" >&6; }
++if test "x$ac_cv_type_long_long" = x""yes; then
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_LONG_LONG 1
+ _ACEOF
+ 
+ 
+ fi
+-ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "
++{ $as_echo "$as_me:$LINENO: checking for int8_t" >&5
++$as_echo_n "checking for int8_t... " >&6; }
++if test "${ac_cv_type_int8_t+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  ac_cv_type_int8_t=no
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
+ #ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
+ #endif
+-"
+-if test "x$ac_cv_type_int32_t" = xyes; then :
+ 
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_INT32_T 1
++int
++main ()
++{
++if (sizeof (int8_t))
++       return 0;
++  ;
++  return 0;
++}
+ _ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-
+-fi
+-ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "
+ #ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
+ #endif
+-"
+-if test "x$ac_cv_type_uint32_t" = xyes; then :
++
++int
++main ()
++{
++if (sizeof ((int8_t)))
++	  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  :
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_int8_t=yes
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int8_t" >&5
++$as_echo "$ac_cv_type_int8_t" >&6; }
++if test "x$ac_cv_type_int8_t" = x""yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_UINT32_T 1
++#define HAVE_INT8_T 1
+ _ACEOF
+ 
+ 
+ fi
+-ac_fn_c_check_type "$LINENO" "int64_t" "ac_cv_type_int64_t" "
++{ $as_echo "$as_me:$LINENO: checking for uint8_t" >&5
++$as_echo_n "checking for uint8_t... " >&6; }
++if test "${ac_cv_type_uint8_t+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  ac_cv_type_uint8_t=no
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
+ #ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
+ #endif
+-"
+-if test "x$ac_cv_type_int64_t" = xyes; then :
++
++int
++main ()
++{
++if (sizeof (uint8_t))
++       return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++
++int
++main ()
++{
++if (sizeof ((uint8_t)))
++	  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  :
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_uint8_t=yes
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint8_t" >&5
++$as_echo "$ac_cv_type_uint8_t" >&6; }
++if test "x$ac_cv_type_uint8_t" = x""yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_INT64_T 1
++#define HAVE_UINT8_T 1
+ _ACEOF
+ 
+ 
+ fi
+-ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "
++{ $as_echo "$as_me:$LINENO: checking for int16_t" >&5
++$as_echo_n "checking for int16_t... " >&6; }
++if test "${ac_cv_type_int16_t+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  ac_cv_type_int16_t=no
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
+ #ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
+ #endif
+-"
+-if test "x$ac_cv_type_uint64_t" = xyes; then :
++
++int
++main ()
++{
++if (sizeof (int16_t))
++       return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++
++int
++main ()
++{
++if (sizeof ((int16_t)))
++	  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  :
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_int16_t=yes
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int16_t" >&5
++$as_echo "$ac_cv_type_int16_t" >&6; }
++if test "x$ac_cv_type_int16_t" = x""yes; then
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_INT16_T 1
++_ACEOF
++
++
++fi
++{ $as_echo "$as_me:$LINENO: checking for uint16_t" >&5
++$as_echo_n "checking for uint16_t... " >&6; }
++if test "${ac_cv_type_uint16_t+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  ac_cv_type_uint16_t=no
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++
++int
++main ()
++{
++if (sizeof (uint16_t))
++       return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++
++int
++main ()
++{
++if (sizeof ((uint16_t)))
++	  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  :
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_uint16_t=yes
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint16_t" >&5
++$as_echo "$ac_cv_type_uint16_t" >&6; }
++if test "x$ac_cv_type_uint16_t" = x""yes; then
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_UINT16_T 1
++_ACEOF
++
++
++fi
++{ $as_echo "$as_me:$LINENO: checking for int32_t" >&5
++$as_echo_n "checking for int32_t... " >&6; }
++if test "${ac_cv_type_int32_t+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  ac_cv_type_int32_t=no
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++
++int
++main ()
++{
++if (sizeof (int32_t))
++       return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++
++int
++main ()
++{
++if (sizeof ((int32_t)))
++	  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  :
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_int32_t=yes
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5
++$as_echo "$ac_cv_type_int32_t" >&6; }
++if test "x$ac_cv_type_int32_t" = x""yes; then
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_INT32_T 1
++_ACEOF
++
++
++fi
++{ $as_echo "$as_me:$LINENO: checking for uint32_t" >&5
++$as_echo_n "checking for uint32_t... " >&6; }
++if test "${ac_cv_type_uint32_t+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  ac_cv_type_uint32_t=no
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++
++int
++main ()
++{
++if (sizeof (uint32_t))
++       return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++
++int
++main ()
++{
++if (sizeof ((uint32_t)))
++	  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  :
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_uint32_t=yes
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
++$as_echo "$ac_cv_type_uint32_t" >&6; }
++if test "x$ac_cv_type_uint32_t" = x""yes; then
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_UINT32_T 1
++_ACEOF
++
++
++fi
++{ $as_echo "$as_me:$LINENO: checking for int64_t" >&5
++$as_echo_n "checking for int64_t... " >&6; }
++if test "${ac_cv_type_int64_t+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  ac_cv_type_int64_t=no
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++
++int
++main ()
++{
++if (sizeof (int64_t))
++       return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++
++int
++main ()
++{
++if (sizeof ((int64_t)))
++	  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  :
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_int64_t=yes
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int64_t" >&5
++$as_echo "$ac_cv_type_int64_t" >&6; }
++if test "x$ac_cv_type_int64_t" = x""yes; then
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_INT64_T 1
++_ACEOF
++
++
++fi
++{ $as_echo "$as_me:$LINENO: checking for uint64_t" >&5
++$as_echo_n "checking for uint64_t... " >&6; }
++if test "${ac_cv_type_uint64_t+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  ac_cv_type_uint64_t=no
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++
++int
++main ()
++{
++if (sizeof (uint64_t))
++       return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++
++int
++main ()
++{
++if (sizeof ((uint64_t)))
++	  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  :
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_uint64_t=yes
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5
++$as_echo "$ac_cv_type_uint64_t" >&6; }
++if test "x$ac_cv_type_uint64_t" = x""yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_UINT64_T 1
diff --git a/SPECS/cyrus-sasl.spec b/SPECS/cyrus-sasl.spec
index e0f4fae..9727469 100644
--- a/SPECS/cyrus-sasl.spec
+++ b/SPECS/cyrus-sasl.spec
@@ -5,10 +5,12 @@
 %define _plugindir2 %{_libdir}/sasl2
 %define bootstrap_cyrus_sasl 0
 
+%global _performance_build 1
+
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.26
-Release: 12.1%{?dist}
+Release: 17%{?dist}
 License: BSD with advertising
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -45,6 +47,10 @@ Patch47: cyrus-sasl-2.1.26-ppc.patch
 # detect gsskrb5_register_acceptor_identity macro (#976538)
 Patch48: cyrus-sasl-2.1.26-keytab.patch
 Patch49: cyrus-sasl-2.1.26-md5global.patch
+# improve sql libraries detection (#1029918)
+Patch50: cyrus-sasl-2.1.26-sql.patch
+# Treat SCRAM-SHA-1/DIGEST-MD5 as more secure than PLAIN (#970718)
+Patch51: cyrus-sasl-2.1.26-prefer-SCRAM-SHA-1-over-PLAIN.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
@@ -185,28 +191,9 @@ chmod -x include/*.h
 %patch47 -p1 -b .ppc
 %patch48 -p1 -b .keytab
 %patch49 -p1 -b .md5global.h
+%patch50 -p1 -b .sql
+%patch51 -p1 -b .sha1vsplain
 
-# FIXME - we remove these files directly so that we can avoid using the -f
-# flag, which has a nasty habit of overwriting files like COPYING.
-rm -f config/config.guess config/config.sub 
-rm -f config/ltconfig config/ltmain.sh config/libtool.m4
-rm -fr autom4te.cache
-libtoolize -c
-aclocal -I config -I cmulocal
-automake -a -c
-autoheader
-autoconf
-
-pushd saslauthd
-rm -f config/config.guess config/config.sub 
-rm -f config/ltconfig config/ltmain.sh config/libtool.m4
-rm -fr autom4te.cache
-libtoolize -c
-aclocal -I config -I ../cmulocal -I ../config
-automake -a -c
-autoheader
-autoconf
-popd
 
 %build
 # Find Kerberos.
@@ -280,7 +267,7 @@ echo "$LDFLAGS"
 %if ! %{bootstrap_cyrus_sasl}
         --enable-ldapdb \
 %endif
-        --enable-sql --with-mysql=%{_libdir} --with-pgsql=%{_libdir} \
+        --enable-sql --with-mysql=yes --with-pgsql=yes \
         --without-sqlite \
         "$@"
         # --enable-auth-sasldb -- EXPERIMENTAL
@@ -435,6 +422,22 @@ getent passwd %{username} >/dev/null || useradd -r -g %{username} -d %{homedir} 
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 2.1.26-17
+- Mass rebuild 2014-01-24
+
+* Wed Jan 15 2014 Honza Horak <hhorak@redhat.com> - 2.1.26-16
+- Rebuild for mariadb-libs
+  Related: #1045013
+
+* Tue Jan 14 2014 Petr Lautrbach <plautrba@redhat.com> 2.1.26-15
+- compile cyrus-sasl with -O3 on ppc64 (#1051063)
+
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 2.1.26-14
+- Mass rebuild 2013-12-27
+
+* Tue Nov 19 2013 Petr Lautrbach <plautrba@redhat.com> 2.1.26-13
+- Treat SCRAM-SHA-1/DIGEST-MD5 as more secure than PLAIN (#970718)
+
 * Tue Oct 01 2013 Petr Lautrbach <plautrba@redhat.com> 2.1.26-12.1
 - rebuild for https://bugzilla.redhat.com/show_bug.cgi?id=1002625