X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=configure.ac;h=f19bdc51d8badba9d431b14a25dbc9566792c14d;hb=2629c4511c68729d98acfd08637c1f00d3807f49;hp=b5c07e7879aba326418af26ae0a9ce0070e0509a;hpb=1b88147837bcf98cf5b70fff4a209ecac7a520f8;p=~andy%2Ffetchmail diff --git a/configure.ac b/configure.ac index b5c07e78..f19bdc51 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 - 2010 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.15-beta3],[fetchmail-users@lists.berlios.de]) +AC_INIT([fetchmail],[6.3.22.1],[fetchmail-users@lists.berlios.de]) AC_CONFIG_SRCDIR([fetchmail.h]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_LIBOBJ_DIR([.]) @@ -32,6 +32,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 @@ -72,7 +73,7 @@ AC_TYPE_SIGNAL AC_CHECK_HEADERS([unistd.h termios.h termio.h sgtty.h stdarg.h \ sys/itimer.h fcntl.h sys/fcntl.h memory.h sys/wait.h \ arpa/inet.h arpa/nameser.h netinet/in.h net/socket.h netdb.h \ - sys/select.h sys/socket.h sys/time.h langinfo.h md5.h]) + sys/select.h sys/socket.h sys/time.h langinfo.h]) if test _$ac_cv_header_stdarg_h != _yes ; then AC_MSG_WARN([stdarg.h is not defined. Unsupported configuration, proceed at your own risk.]) fi @@ -137,7 +138,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. @@ -170,10 +171,6 @@ dnl [LIBS="$LIBS -lintl"]) AC_REPLACE_FUNCS([strstr strcasecmp memmove stpcpy strlcpy strlcat]) -AC_SEARCH_LIBS(MD5Init, [md5, md], [], - [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)"]) @@ -244,11 +241,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; @@ -441,6 +433,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, @@ -465,8 +458,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) @@ -803,9 +796,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], @@ -844,6 +843,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 @@ -899,11 +899,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 ,------------------------------------------------------------------