Better detection of sasl_callback_ft

edomazlicky · Feb 2, 2012 · dece7f8 · dece7f8
1 parent c1c99c9
commit dece7f8
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/configure.ac b/configure.ac
@@ -301,6 +301,33 @@ AH_BOTTOM([#ifdef HAVE_INTTYPES_H
 #endif
 ])
 
+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

diff --git a/sasl_defs.c b/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
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@