From 45e4982ccaecf2fc3ca6716767a8e343625a280d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 30 Mar 2006 11:20:47 +0000
Subject: r14816: Simplify test for comparison_fn_t (This used to be commit
 594215d1176b23596549fd4e4098d42ef41f7d0d)

---
 source4/auth/gensec/gensec.h  |  2 ++
 source4/build/m4/rewrite.m4   | 20 --------------------
 source4/lib/replace/config.m4 |  2 ++
 3 files changed, 4 insertions(+), 20 deletions(-)

(limited to 'source4')

diff --git a/source4/auth/gensec/gensec.h b/source4/auth/gensec/gensec.h
index f51f8245e3..4be97dfeaa 100644
--- a/source4/auth/gensec/gensec.h
+++ b/source4/auth/gensec/gensec.h
@@ -24,6 +24,8 @@
 #ifndef __GENSEC_H__
 #define __GENSEC_H__
 
+#include "core.h"
+
 #define GENSEC_OID_NTLMSSP "1 3 6 1 4 1 311 2 2 10"
 #define GENSEC_OID_SPNEGO "1 3 6 1 5 5 2"
 #define GENSEC_OID_KERBEROS5 "1 2 840 113554 1 2 2"
diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4
index b3198f1c2c..2e94fb215e 100644
--- a/source4/build/m4/rewrite.m4
+++ b/source4/build/m4/rewrite.m4
@@ -714,23 +714,3 @@ if test $space = no; then
     AC_DEFINE(STAT_STATFS2_FS_DATA,1,[Whether statfs requires 2 arguments and struct fs_data is available])
   fi
 fi
-
-
-
-#######################################
-# Check for comparison_fn_t
-AC_CACHE_CHECK([for comparison_fn_t],samba_cv_HAVE_COMPARISON_FN_T,[
-AC_TRY_COMPILE([
-#include <stdlib.h>
-int list_find(const void *needle, 
-	      const void *base, size_t nmemb, size_t size, comparison_fn_t comp_fn)
-{
-	return 1;
-}
-],[],
-samba_cv_HAVE_COMPARISON_FN_T=yes,samba_cv_HAVE_COMPARISON_FN_T=no)
-])
-if test x"$samba_cv_HAVE_COMPARISON_FN_T" = x"yes"; then
-	AC_DEFINE(HAVE_COMPARISON_FN_T,1,[Whether or not we have comparison_fn_t])
-fi
-
diff --git a/source4/lib/replace/config.m4 b/source4/lib/replace/config.m4
index 379c14e776..873e7b2bca 100644
--- a/source4/lib/replace/config.m4
+++ b/source4/lib/replace/config.m4
@@ -11,6 +11,8 @@ AC_CHECK_TYPE(u_int32_t, unsigned long)
 AC_CHECK_TYPE(u_int16_t, unsigned short)
 AC_CHECK_TYPE(u_int8_t, unsigned char)
 AC_CHECK_TYPE(ssize_t, int)
+AC_CHECK_TYPE(comparison_fn_t, 
+[AC_DEFINE(HAVE_COMPARISON_FN_T, 1,[Whether or not we have comparison_fn_t])])
 
 AC_CACHE_CHECK([for broken inet_ntoa],samba_cv_REPLACE_INET_NTOA,[
 AC_TRY_RUN([
-- 
cgit