X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.ac;h=69a09ca3098b30a6d795e7960e5e5271ef4eaeda;hp=cd48fad3e70dd893c839f1d7d7a0c4ed8225d0c3;hb=65734c98c7ff56a0258bc9052667a0cb9c2f1d0b;hpb=61fec8f6b3bff64d96d016a14729ab1ea2c4a2e8 diff --git a/configure.ac b/configure.ac index cd48fad..69a09ca 100644 --- a/configure.ac +++ b/configure.ac @@ -9,13 +9,11 @@ AM_CONFIG_HEADER(config.h) mutt_cv_version=`cat "$srcdir/VERSION.in"` -AM_INIT_AUTOMAKE(muttng, $mutt_cv_version) +AM_INIT_AUTOMAKE(madmutt, $mutt_cv_version) AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION.in']) AC_GNU_SOURCE -ifdef([AC_LIBOBJ], , [define([AC_LIBOBJ], [LIB[]OBJS="$LIBOBJS $1.o"])]) - ALL_LINGUAS="de ru it es uk fr pl nl cs id sk ko el zh_TW zh_CN pt_BR eo gl sv da lt tr ja hu et ca bg" AC_CANONICAL_HOST @@ -38,6 +36,7 @@ AC_PROG_CPP AC_PROG_MAKE_SET AC_PROG_INSTALL AC_PROG_RANLIB +AC_PROG_GPERF AC_CHECK_TOOL(AR, ar, ar) AC_C_INLINE @@ -127,35 +126,6 @@ dnl ---------------- gpgme ---------------- AC_SUBST(LIBGPGME_CFLAGS) AC_SUBST(LIBGPGME_LIBS) - -dnl ---------------- pgp/smime ---------------- - - AC_ARG_ENABLE(pgp, AC_HELP_STRING([--disable-pgp], [Disable PGP support]), - [ if test x$enableval = xno ; then - have_pgp=no - fi - ]) - - if test x$have_pgp != xno ; then - AC_DEFINE(CRYPT_BACKEND_CLASSIC_PGP,1, - [ Define if you want classic PGP support. ]) - PGPAUX_TARGET="pgpringng\$(EXEEXT) pgpewrapng\$(EXEEXT)" - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o crypt-mod-pgp-classic.o" - fi - - AC_ARG_ENABLE(smime, AC_HELP_STRING([--disable-smime], [Disable SMIME support]), - [ if test x$enableval = xno ; then - have_smime=no - fi - ]) - - if test x$have_smime != xno ; then - AC_DEFINE(CRYPT_BACKEND_CLASSIC_SMIME,1, [ Define if you want clasic S/MIME support. ]) - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS smime.o crypt-mod-smime-classic.o" - SMIMEAUX_TARGET="smime_keysng" - fi - - dnl ---------------- mixmaster ---------------- AC_ARG_WITH(mixmaster, AC_HELP_STRING([--with-mixmaster[=PATH]], [Include Mixmaster support]), @@ -173,10 +143,6 @@ dnl ---------------- mixmaster ---------------- OPS="$OPS \$(srcdir)/OPS.PGP \$(srcdir)/OPS.SMIME \$(srcdir)/OPS.CRYPT " AC_SUBST([OPS]) - -AC_SUBST(PGPAUX_TARGET) -AC_SUBST(SMIMEAUX_TARGET) - AC_PATH_PROG(ISPELL, ispell, no) if test $ISPELL != no; then AC_DEFINE_UNQUOTED(ISPELL,"$ISPELL",[ Where to find ispell on your system. ]) @@ -321,7 +287,6 @@ fi AC_DECL_SYS_SIGLIST AC_TYPE_PID_T -dnl AC_CHECK_TYPE(ssize_t, int) AC_CHECK_FUNCS(fgetpos memmove setegid srand48 strerror) AC_REPLACE_FUNCS(strcasecmp setenv) @@ -332,15 +297,6 @@ if test $ac_cv_func_getopt = yes; then AC_CHECK_HEADERS(getopt.h) fi -dnl SCO uses chsize() instead of ftruncate() -AC_CHECK_FUNCS(ftruncate, , [AC_CHECK_LIB(x, chsize)]) - -dnl SCO has strftime() in libintl -AC_CHECK_FUNCS(strftime, , [AC_CHECK_LIB(intl, strftime)]) - -dnl AIX may not have fchdir() -AC_CHECK_FUNCS(fchdir, , [mutt_cv_fchdir=no]) - AC_ARG_WITH(regex, AC_HELP_STRING([--with-regex], [Use the GNU regex library]), [mutt_cv_regex=yes], [AC_CHECK_FUNCS(regcomp, mutt_cv_regex=no, mutt_cv_regex=yes)]) @@ -361,7 +317,7 @@ fi if test $mutt_cv_regex = yes; then AC_DEFINE(USE_GNU_REGEX,1,[ Define if you want to use the included regex.c. ]) - AC_LIBOBJ(regex) + LIBOBJS="$LIBOBJS regex.o" fi @@ -458,67 +414,27 @@ fi AC_SUBST(DOTLOCK_GROUP) AC_SUBST(DOTLOCK_PERMISSION) -AC_ARG_WITH(domain, AC_HELP_STRING([--with-domain=DOMAIN], [Specify your DNS domain name]), - [if test $withval != yes; then - if test $withval != no; then - AC_DEFINE_UNQUOTED(DOMAIN,"$withval",[ Define your domain name. ]) - fi - fi]) - -need_socket="no" - dnl -- socket dependencies -- -AC_ARG_ENABLE(pop, AC_HELP_STRING([--enable-pop], [Enable POP3 support]), -[ if test x$enableval = xyes ; then - AC_DEFINE(USE_POP,1,[ Define if you want support for the POP3 protocol. ]) - LIBPOP="-Lpop -lpop" - LIBPOPDEPS="\$(top_srcdir)/pop/pop.h pop/libpop.a" - need_socket="yes" - need_pop="yes" - need_md5="yes" - fi -]) -AM_CONDITIONAL(BUILD_POP, test x$need_pop = xyes) - -AC_ARG_ENABLE(imap, AC_HELP_STRING([--enable-imap], [Enable IMAP support]), -[ if test x$enableval = xyes ; then - AC_DEFINE(USE_IMAP,1,[ Define if you want support for the IMAP protocol. ]) - LIBIMAP="-Limap -limap" - LIBIMAPDEPS="\$(top_srcdir)/imap/imap.h imap/libimap.a" - need_imap="yes" - need_socket="yes" - need_md5="yes" - fi -]) -AM_CONDITIONAL(BUILD_IMAP, test x$need_imap = xyes) - AC_ARG_ENABLE(nntp, [ --enable-nntp Enable NNTP support], [ if test x$enableval = xyes ; then AC_DEFINE(USE_NNTP,1,[ Compiling with newsreading support with NNTP ]) LIBNNTP="-Lnntp -lnntp" LIBNNTPDEPS="\$(top_srcdir)/nntp/nntp.h nntp/libnntp.a" need_nntp="yes" - need_socket="yes" fi ]) AM_CONDITIONAL(BUILD_NNTP, test x$need_nntp = xyes) dnl -- end socket dependencies -- -if test "$need_socket" = "yes" -then - AC_MSG_CHECKING([for socklen_t]) - AC_EGREP_HEADER(socklen_t, sys/socket.h, AC_MSG_RESULT([yes]), - AC_MSG_RESULT([no]) - AC_DEFINE(socklen_t,int, [ Define to 'int' if doesn't have it. ])) - AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent)) - AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) - AC_CHECK_FUNCS(getaddrinfo) - AC_DEFINE(USE_SOCKET,1, - [ Include code for socket support. Set automatically if you enable POP3 or IMAP ]) - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS account.o mutt_socket.o mutt_tunnel.o" -fi +AC_MSG_CHECKING([for socklen_t]) +AC_EGREP_HEADER(socklen_t, sys/socket.h, AC_MSG_RESULT([yes]), + AC_MSG_RESULT([no]) + AC_DEFINE(socklen_t,int, [ Define to 'int' if doesn't have it. ])) +AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent)) +AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) +AC_CHECK_FUNCS(getaddrinfo) dnl -- imap dependencies -- @@ -526,8 +442,6 @@ AC_ARG_WITH(gss, AC_HELP_STRING([--with-gss[=PFX]], [Compile in GSSAPI authentic gss_prefix="$withval", gss_prefix="no") if test "$gss_prefix" != "no" then - if test "$need_imap" = "yes" - then MUTT_AM_PATH_GSSAPI(gss_prefix) AC_MSG_CHECKING(GSSAPI implementation) AC_MSG_RESULT($GSSAPI_IMPL) @@ -544,9 +458,6 @@ then MUTTLIBS="$MUTTLIBS $GSSAPI_LIBS" AC_DEFINE(USE_GSS,1,[ Define if you have GSSAPI libraries available ]) need_gss="yes" - else - AC_MSG_WARN([GSS was requested but IMAP is not enabled]) - fi fi AM_CONDITIONAL(USE_GSS, test x$need_gss = xyes) @@ -555,10 +466,6 @@ dnl -- end imap dependencies -- AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl[=PFX]], [Compile in SSL support for POP/IMAP]), [ if test "$with_ssl" != "no" then - if test "$need_socket" != "yes"; then - AC_MSG_ERROR([SSL support is only useful with POP or IMAP support]) - fi - if test "$with_ssl" != "yes" then LDFLAGS="$LDFLAGS -L$withval/lib" @@ -584,10 +491,6 @@ AC_ARG_WITH([gnutls], AC_HELP_STRING([--with-gnutls[=PFX]], [Enable SSL support [gnutls_prefix="$withval"], [gnutls_prefix="no"]) if test "$gnutls_prefix" != "no" then - if test "$need_socket" != "yes" - then - AC_MSG_ERROR([SSL support is only useful with POP or IMAP support]) - fi if test x"$need_ssl" = x"yes" then AC_MSG_ERROR([Only either OpenSSL or GNUTLS may be used]) @@ -607,13 +510,9 @@ fi AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes) -AC_ARG_WITH(sasl2, AC_HELP_STRING([--with-sasl2[=PFX]], [Use Cyrus SASL library version 2 for POP/IMAP authentication]), +AC_ARG_WITH(sasl2, AC_HELP_STRING([--with-sasl2[=PFX]], + [Use Cyrus SASL library version 2 for POP/IMAP authentication]), [ - if test "$with_sasl2" != "no" -a "$need_imap" != "yes" -a "$need_pop" != "yes" - then - AC_MSG_ERROR([SASL2 support is only useful with POP or IMAP support]) - fi - if test "$with_sasl2" != "no" then if test "$with_sasl2" != "yes" @@ -649,19 +548,19 @@ AC_ARG_WITH(idn, AC_HELP_STRING([--with-idn=[PFX]], [Use GNU libidn for domain n ) if test "x$with_idn" != "xno"; then - AC_CHECK_LIB(idn, stringprep_check_version) - AC_CHECK_FUNCS(idna_to_unicode_utf8_from_utf8 idna_to_unicode_8z8z) - AC_CHECK_FUNCS(idna_to_ascii_from_utf8 idna_to_ascii_8z) - AC_CHECK_FUNCS(idna_to_ascii_lz idna_to_ascii_from_locale) + AC_CHECK_LIB(idn, stringprep_check_version) + AC_CHECK_FUNCS(idna_to_unicode_utf8_from_utf8 idna_to_unicode_8z8z) + AC_CHECK_FUNCS(idna_to_ascii_from_utf8 idna_to_ascii_8z) + AC_CHECK_FUNCS(idna_to_ascii_lz idna_to_ascii_from_locale) fi dnl -- end socket -- AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [Enable debugging support]), - [ if test x$enableval = xyes ; then - AC_DEFINE(DEBUG,1,[ Define to enable debugging info. ]) - fi - ]) + [ if test x$enableval = xyes ; then + AC_DEFINE(DEBUG,1,[ Define to enable debugging info. ]) + fi + ]) AC_ARG_ENABLE(flock, AC_HELP_STRING([--enable-flock], [Use flock() to lock files]), [if test $enableval = yes; then @@ -685,63 +584,11 @@ if test x$ac_cv_dirent_d_ino = xyes ; then fi AC_MSG_RESULT($ac_cv_dirent_d_ino) -dnl This may look cumbersome -- please keep it that way, so we can -dnl quickly change the default to "yes" again. -mutt_cv_inodesort=no -AC_ARG_ENABLE(inodesort, AC_HELP_STRING([--enable-inodesort], [Read files in maildir folders sorted by inode.]), - [if test x$enableval = xyes -a x$ac_cv_dirent_d_ino = xyes ; then mutt_cv_inodesort=yes; fi]) - -if test $mutt_cv_inodesort = yes; then - AC_DEFINE(USE_INODESORT, 1, [ Define to sort files in a maildir by inode number. ]) -fi - -mutt_cv_warnings=yes -AC_ARG_ENABLE(warnings, AC_HELP_STRING([--disable-warnings], [Turn off compiler warnings (not recommended)]), -[if test $enableval = no; then - mutt_cv_warnings=no -fi]) - -if test x$GCC = xyes -a $mutt_cv_warnings = yes; then - CFLAGS="-Wall -pedantic $CFLAGS" -fi - -AC_ARG_ENABLE(nfs-fix, AC_HELP_STRING([--enable-nfs-fix], [Work around an NFS with broken attributes caching]), - [if test x$enableval = xyes; then - AC_DEFINE(NFS_ATTRIBUTE_HACK,1, - [Define if you have problems with mutt not detecting - new/old mailboxes over NFS. Some NFS implementations - incorrectly cache the attributes of small files.]) - fi]) - AC_ARG_ENABLE(buffy-size, AC_HELP_STRING([--enable-buffy-size], [Use file size attribute instead of access time]), [if test x$enableval = xyes; then AC_DEFINE(BUFFY_SIZE,1,[ Define to enable the "buffy_size" feature. ]) fi]) -AC_ARG_ENABLE(mailtool, AC_HELP_STRING([--enable-mailtool], [Enable Sun mailtool attachments support ]), - [if test x$enableval = xyes; then - AC_DEFINE(SUN_ATTACHMENT,1,[ Define to enable Sun mailtool attachments support. ]) - fi]) - -AC_ARG_ENABLE(compressed, [ --enable-compressed Enable compressed folders support ], - [if test x$enableval = xyes; then - AC_DEFINE(USE_COMPRESSED,1,[ The compressed mailboxes support ]) - fi]) - -AC_ARG_ENABLE(locales-fix, AC_HELP_STRING([--enable-locales-fix], [The result of isprint() is unreliable ]), - [if test x$enableval = xyes; then - AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) - fi]) - -AC_ARG_WITH(exec-shell, AC_HELP_STRING([--with-exec-shell=SHELL], [Specify alternate shell (ONLY if /bin/sh is broken)]), - [if test $withval != yes; then - AC_DEFINE_UNQUOTED(EXECSHELL, "$withval", - [program to use for shell commands]) - else - AC_DEFINE_UNQUOTED(EXECSHELL, "/bin/sh") - fi], - [AC_DEFINE_UNQUOTED(EXECSHELL, "/bin/sh")]) - dnl -- start cache -- AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching]), [if test x$enableval = xyes; then @@ -867,10 +714,6 @@ dnl -- end cache -- AC_SUBST(MUTTLIBS) AC_SUBST(MUTT_LIB_OBJECTS) -AC_SUBST(LIBIMAP) -AC_SUBST(LIBIMAPDEPS) -AC_SUBST(LIBPOP) -AC_SUBST(LIBPOPDEPS) AC_SUBST(LIBNNTP) AC_SUBST(LIBNNTPDEPS) @@ -1157,10 +1000,11 @@ AC_OUTPUT(Makefile intl/Makefile m4/Makefile muttbug.sh lib-lib/Makefile lib-mime/Makefile + lib-crypt/Makefile lib-hash/Makefile lib/Makefile imap/Makefile pop/Makefile nntp/Makefile - Muttngrc.head + Madmuttrc.head doc/instdoc.sh)