X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=configure.ac;h=f012c7a9ab69b55de9aa8871074713bc0886e837;hb=d31db10231e9ed89f64fdf6e0fb7cae182aa377e;hp=1aa5b0810104a468a91aaba45b8a61a087859f26;hpb=676d9737f370789512050140993228172b4d6949;p=~andy%2Ffetchmail diff --git a/configure.ac b/configure.ac index 1aa5b081..f012c7a9 100644 --- a/configure.ac +++ b/configure.ac @@ -3,13 +3,13 @@ dnl Autoconfigure input file for fetchmail # Fetchmail automatic configuration support # # Eric S. Raymond -# 2004 - 2009 Matthias Andree +# 2004 - 2012 Matthias Andree # dnl Process this file with autoconf to produce a configure script. dnl dnl XXX - if bumping version here, check fetchmail.man, too! -AC_INIT([fetchmail],[6.3.13],[fetchmail-users@lists.berlios.de]) +AC_INIT([fetchmail],[6.3.24],[fetchmail-users@lists.berlios.de]) AC_CONFIG_SRCDIR([fetchmail.h]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_LIBOBJ_DIR([.]) @@ -19,7 +19,8 @@ AC_CANONICAL_HOST dnl automake options are in Makefile.am AC_PREREQ(2.60) dnl 2.60 required for AC_USE_SYSTEM_EXTENSIONS -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([silent-rules -Wall]) +AM_SILENT_RULES dnl python is optional # @@ -32,6 +33,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) AC_PROG_AWK AC_PROG_CC +AM_PROG_CC_C_O AC_PROG_INSTALL AC_PROG_CPP dnl Later checks need this. AC_PROG_RANLIB @@ -93,6 +95,13 @@ AC_CHECK_HEADERS([resolv.h],,,[ #endif ]) +AC_CHECK_DECLS([h_errno],,,[ + AC_INCLUDES_DEFAULT + #ifdef HAVE_NETDB_H + #include + #endif +]) + AC_C_CONST dnl getopt needs this. AM_PROG_LEX @@ -107,8 +116,8 @@ darwin*) ;; # Check for FreeBSD special case: more libs needed freebsd*) - AC_MSG_NOTICE(found FreeBSD - Adding -lmd -lkvm -lcom_err to standard libraries) - LIBS="$LIBS -lmd -lkvm -lcom_err" + AC_MSG_NOTICE(found FreeBSD - Adding -lkvm -lcom_err to standard libraries) + LIBS="$LIBS -lkvm -lcom_err" ;; # Check for LynxOS special case: -lbsd needed (at least on 2.3.0) and -s # not working. @@ -130,7 +139,7 @@ AC_CACHE_SAVE dnl i18n AM_GNU_GETTEXT([external], [need-ngettext]) -AM_GNU_GETTEXT_VERSION([0.14.6]) +AM_GNU_GETTEXT_VERSION([0.17]) dnl end i18n # Under sysV68, socket and friends are provided by the C library. @@ -163,10 +172,6 @@ dnl [LIBS="$LIBS -lintl"]) AC_REPLACE_FUNCS([strstr strcasecmp memmove stpcpy strlcpy strlcat]) -AC_CHECK_FUNC(MD5Init, [], - [AC_LIBSOURCE(md5c.c) - EXTRAOBJ="$EXTRAOBJ md5c.\$(OBJEXT)"]) - AC_CHECK_FUNC(getopt_long, [], [AC_LIBSOURCES([getopt.c, getopt1.c]) EXTRAOBJ="$EXTRAOBJ getopt.\$(OBJEXT) getopt1.\$(OBJEXT)"]) @@ -180,7 +185,7 @@ AC_CHECK_FUNCS(tcsetattr stty setsid geteuid seteuid dnl atexit inet_aton strftime setrlimit socketpair dnl sigaction strdup setlocale) -AC_CHECK_DECLS(strerror) +AC_CHECK_DECLS([strerror,getenv]) dnl INET6 is used by KAME/getnameinfo AC_CACHE_CHECK(for AF_INET6/PF_INET6,ac_cv_inet6, AC_COMPILE_IFELSE([ @@ -237,11 +242,6 @@ done dnl Check for libcrypt -- it may live in libc or libcrypt, as on IRIX AC_CHECK_FUNC(crypt, , AC_CHECK_LIB(crypt,crypt)) -dnl Check for RSA refersence library in case we're using SSL -AC_CHECK_LIB(rsaref, RSAPublicDecrypt) - -dnl AC_FUNC_SETVBUF_REVERSED - dnl Check for usable void pointer type AC_MSG_CHECKING(use of void pointer type) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[char *p; @@ -434,6 +434,7 @@ AC_ARG_ENABLE(NTLM, [with_NTLM=$enableval], [with_NTLM=no]) test "$with_NTLM" = "yes" && AC_DEFINE(NTLM_ENABLE,1,Define if you want NTLM authentication) +AM_CONDITIONAL(NTLM_ENABLE, test "$with_NTLM" = yes) ### use option --enable-SDPS to compile in the SDPS support AC_ARG_ENABLE(SDPS, @@ -458,8 +459,8 @@ AC_CACHE_SAVE ### use option --enable-opie to compile in the OPIE support AC_ARG_ENABLE(opie, [ --enable-opie support OTP through the OPIE library], - [ AC_CHECK_HEADER(opie.h,, [AC_MSG_ERROR(cannot find , which is required for OPIE support.)]) - AC_CHECK_LIB(opie,opiegenerator,, [AC_MSG_ERROR(cannot find libopie, which is required for OPIE support.)]) + [ AC_CHECK_HEADER(opie.h,, [AC_MSG_ERROR([cannot find , which is required for OPIE support.])]) + AC_CHECK_LIB(opie,opiegenerator,, [AC_MSG_ERROR([cannot find libopie, which is required for OPIE support.])]) with_opie=$enableval], [with_opie=no]) test "$with_opie" = "yes" && AC_DEFINE(OPIE_ENABLE,1,Define if you want OPIE support compiled in) @@ -495,7 +496,7 @@ AC_CACHE_CHECK([for getnameinfo],[fm_cv_getnameinfo],[ #include #endif #ifndef NULL -#define NULL ((void *)0) +#define NULL 0 #endif ], [getnameinfo(NULL,0, NULL,0, NULL, 0, 0);], [ fm_cv_getnameinfo=yes], @@ -784,7 +785,7 @@ then save_LIBS="$LIBS" for i in "" "-ldl" ; do LIBS="$LDFLAGS $save_LIBS $i" - AC_LINK_IFELSE([AC_LANG_PROGRAM(,[SSL_library_init()])],[found=1; break]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ],[SSL_library_init()])],[found=1; break]) done if test $found = 0 ; then AC_MSG_RESULT([error]) @@ -796,9 +797,15 @@ then dnl XXX FIXME: use pkg-config if available! AC_DEFINE(SSL_ENABLE) else - AC_MSG_NOTICE(Disabling SSL support.) + AC_MSG_WARN(Disabling SSL support.) + AC_MSG_WARN(Consider re-running configure --with-ssl.) fi +case "$LIBS" in *-lssl*) + AC_CHECK_DECLS([SSLv2_client_method],,,[#include ]) + ;; +esac + ### use option --with-socks=DIR to point at SOCKS library AC_ARG_WITH(socks, [ --with-socks[=DIR] add built-in SOCKS firewall access], @@ -837,6 +844,7 @@ then LDFLAGS="$ac_savedLDFLAGS" fi]) +dnl for libesmtp/ modules: ACX_WHICH_GETHOSTBYNAME_R ### use option --with-hesiod=DIR to point at a HESIOD directory @@ -892,11 +900,20 @@ then CPPFLAGS="$CPPFLAGS -I$with_gssapi/include" fi AC_CHECK_HEADERS(gss.h gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h) - if test "$ac_cv_header_gssapi_h" = "yes"; then - AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h, AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,1,Define if you have MIT kerberos)) - else - AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi/gssapi.h, AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE)) - fi + AC_CHECK_DECLS(GSS_C_NT_HOSTBASED_SERVICE,,,[ + AC_INCLUDES_DEFAULT + #if HAVE_GSS_H + #include + #endif + #if HAVE_GSSAPI_GSSAPI_H + #include + #elif HAVE_GSSAPI_H + #include + #endif + #if HAVE_GSSAPI_GSSAPI_GENERIC_H + #include + #endif + ]) fi]) dnl ,------------------------------------------------------------------