X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=m4%2Fspamassassin.m4;h=04007371537613e8a28eba6f82d5e0119020536b;hp=002bd860da092d83642160c81f51e610c3e2c8b8;hb=ad797671f663bcbabb05349bf7b29565b8d3e431;hpb=d04ac7fcb7f51d68b182c909708ef1741d572d08

diff --git a/m4/spamassassin.m4 b/m4/spamassassin.m4
index 002bd860d..040073715 100644
--- a/m4/spamassassin.m4
+++ b/m4/spamassassin.m4
@@ -5,17 +5,16 @@ AC_DEFUN([AC_SPAMASSASSIN],
 
 AC_CHECK_HEADERS(sys/time.h syslog.h unistd.h errno.h sys/errno.h)
 AC_CHECK_HEADERS(time.h sysexits.h sys/socket.h netdb.h netinet/in.h)
-AC_CHECK_HEADERS(openssl/crypto.h)
 
 AC_CACHE_CHECK([for SHUT_RD],
-       shutrd, [
+       spamassassin_cv_has_shutrd, [
                 AC_TRY_COMPILE([#include <sys/types.h>
 #include <sys/socket.h>],
                         [printf ("%d", SHUT_RD); return 0;],
-                                        [shutrd=yes],
-                                        [shutrd=no]),
+                                        [spamassassin_cv_has_shutrd=yes],
+                                        [spamassassin_cv_has_shutrd=no]),
        ])
-if test $shutrd = yes ; then
+if test $spamassassin_cv_has_shutrd = yes ; then
   AC_DEFINE(HAVE_SHUT_RD, 1, HAVE_SHUT_RD)
 fi
 
@@ -26,13 +25,13 @@ AC_CHECK_FUNCS(socket strdup strtod strtol snprintf shutdown)
 dnl ----------------------------------------------------------------------
 
 AC_CACHE_CHECK([for h_errno],
-        herrno, [
+        spamassassin_cv_has_herrno, [
                 AC_TRY_COMPILE([#include <netdb.h>],
                         [printf ("%d", h_errno); return 0;],
-                                        [herrno=yes],
-                                        [herrno=no]),
+                                        [spamassassin_cv_has_herrno=yes],
+                                        [spamassassin_cv_has_herrno=no]),
         ])
-if test $herrno = yes ; then
+if test $spamassassin_cv_has_herrno = yes ; then
   AC_DEFINE(HAVE_H_ERRNO, 1, HAVE_H_ERRNO)
 fi
 
@@ -41,49 +40,45 @@ dnl ----------------------------------------------------------------------
 dnl ----------------------------------------------------------------------
 
 AC_CACHE_CHECK([for in_addr_t],
-        inaddrt, [
+        spamassassin_cv_has_inaddrt, [
                 AC_TRY_COMPILE([#include <sys/types.h>
 #include <netinet/in.h>],
                         [in_addr_t foo; return 0;],
-                                        [inaddrt=yes],
-                                        [inaddrt=no]),
+                                        [spamassassin_cv_has_inaddrt=yes],
+                                        [spamassassin_cv_has_inaddrt=no]),
         ])
-if test $inaddrt = no ; then
+if test $spamassassin_cv_has_inaddrt = no ; then
   AC_CHECK_TYPE(in_addr_t, unsigned long)
 fi
 
 dnl ----------------------------------------------------------------------
 
 AC_CACHE_CHECK([for INADDR_NONE],
-        haveinaddrnone, [
+        spamassassin_cv_has_haveinaddrnone, [
                 AC_TRY_COMPILE([#include <sys/types.h>
 #include <netinet/in.h>],
                         [in_addr_t foo = INADDR_NONE; return 0;],
-                                        [haveinaddrnone=yes],
-                                        [haveinaddrnone=no]),
+                                        [spamassassin_cv_has_haveinaddrnone=yes],
+                                        [spamassassin_cv_has_haveinaddrnone=no]),
         ])
-if test $haveinaddrnone = yes ; then
+if test $spamassassin_cv_has_haveinaddrnone = yes ; then
   AC_DEFINE(HAVE_INADDR_NONE, 1, HAVE_INADDR_NONE)
 fi
 
 dnl ----------------------------------------------------------------------
 
 AC_CACHE_CHECK([for EX__MAX],
-        haveexmax, [
+        spamassassin_cv_has_haveexmax, [
                 AC_TRY_COMPILE([#ifdef HAVE_SYSEXITS_H
 #include <sysexits.h>
 #endif
 #include <errno.h>],
                         [int foo = EX__MAX; return 0;],
-                                        [haveexmax=yes],
-                                        [haveexmax=no]),
+                                        [spamassassin_cv_has_haveexmax=yes],
+                                        [spamassassin_cv_has_haveexmax=no]),
         ])
-if test $haveexmax = yes ; then
+if test $spamassassin_cv_has_haveexmax = yes ; then
   AC_DEFINE(HAVE_EX__MAX, 1, HAVE_EX__MAX)
 fi
 
-if test x$ac_cv_enable_openssl = xyes; then
-    AC_DEFINE(SPAMC_SSL, 1, Compile libspamc with OpenSSL support)
-fi
-
 ])