Permalink
Browse files

Better detection of sasl_callback_ft

  • Loading branch information...
1 parent c1c99c9 commit dece7f87e789f35311bfab785fcd9a063ead1afd @dustin dustin committed with dormando Feb 1, 2012
Showing with 28 additions and 1 deletion.
  1. +27 −0 configure.ac
  2. +1 −1 sasl_defs.c
View
27 configure.ac
@@ -302,6 +302,33 @@ AH_BOTTOM([#ifdef HAVE_INTTYPES_H
])
dnl **********************************************************************
+dnl Figure out if this system has the stupid sasl_callback_ft
+dnl **********************************************************************
+
+AC_DEFUN([AC_HAVE_SASL_CALLBACK_FT],
+[AC_CACHE_CHECK(for sasl_callback_ft, ac_cv_has_sasl_callback_ft,
+[
+ AC_TRY_COMPILE([
+ #ifdef HAVE_SASL_SASL_H
+ #include <sasl/sasl.h>
+ #include <sasl/saslplug.h>
+ #endif
+ ],[
+ sasl_callback_ft a_callback;
+ ],[
+ ac_cv_has_sasl_callback_ft=yes
+ ],[
+ ac_cv_has_sasl_callback_ft=no
+ ])
+])
+if test $ac_cv_has_sasl_callback_ft = yes; then
+ AC_DEFINE(HAVE_SASL_CALLBACK_FT, 1, [we have sasl_callback_ft])
+fi
+])
+
+AC_HAVE_SASL_CALLBACK_FT
+
+dnl **********************************************************************
dnl DETECT_UINT64_SUPPORT
dnl
dnl check if we can use a uint64_t
View
2 sasl_defs.c
@@ -18,7 +18,7 @@ const char * const locations[] = {
};
#endif
-#if SASL_VERSION_FULL < 0x20125
+#ifndef HAVE_SASL_CALLBACK_FT
typedef int (*sasl_callback_ft)(void);
#endif

0 comments on commit dece7f8

Please sign in to comment.