X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.ac;h=42d180601911a38b1a421fb1e2886189792d1db2;hp=5d30be4531b188b19ae3237fbff7c00300df4435;hb=7d29626ce4e1fa932c6349c7253e6f774df069fc;hpb=1dc7032b59cc5b91d70076ed228bda8caf65a7f3 diff --git a/configure.ac b/configure.ac index 5d30be4..42d1806 100644 --- a/configure.ac +++ b/configure.ac @@ -6,65 +6,34 @@ dnl !!! TO DUMP THEIR RESULTS WHEN MUTT -V IS CALLED !!! AC_PREREQ([2.50]) AC_INIT([mutt.h]) AM_CONFIG_HEADER(config.h) +AM_INIT_AUTOMAKE(madmutt, `cat "$srcdir/VERSION.in"`) -mutt_cv_version=`cat "$srcdir/VERSION.in"` - -AM_INIT_AUTOMAKE(muttng, $mutt_cv_version) AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION.in']) -dnl AC_GNU_SOURCE - -ifdef([AC_LIBOBJ], , [define([AC_LIBOBJ], [LIB[]OBJS="$LIBOBJS $1.o"])]) +AC_GNU_SOURCE 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 -AC_MSG_CHECKING([for prefix]) -if test x$prefix = xNONE; then - mutt_cv_prefix=$ac_default_prefix -else - mutt_cv_prefix=$prefix -fi -AC_MSG_RESULT($mutt_cv_prefix) - -AC_PROG_CC -AC_ISC_POSIX -AM_C_PROTOTYPES -if test "x$U" != "x"; then - AC_MSG_ERROR(Compiler not ANSI compliant) -fi AC_PROG_CPP +AC_PROG_CC_C99 +AC_ISC_POSIX +AC_HEADER_STDC + +PKG_PROG_PKG_CONFIG AC_PROG_MAKE_SET AC_PROG_INSTALL AC_PROG_RANLIB +AC_PROG_GPERF AC_CHECK_TOOL(AR, ar, ar) -AC_C_INLINE -AC_C_CONST - AC_SYS_LARGEFILE AC_FUNC_FSEEKO AC_CHECK_SIZEOF(off_t) -AC_PATH_PROG(DBX, dbx, no) -AC_PATH_PROG(GDB, gdb, no) -AC_PATH_PROG(SDB, sdb, no) - -if test $GDB != no ; then - DEBUGGER=$GDB -elif test $DBX != no ; then - DEBUGGER=$DBX -elif test $SDB != no ; then - DEBUGGER=$SDB -else - DEBUGGER=no -fi - -AC_SUBST([DEBUGGER]) - AH_TEMPLATE([sig_atomic_t], - [/* Define to `int' if doesn't define.]) + [Define to 'int' if doesn't define.]) AH_TEMPLATE([HAVE_START_COLOR], [Define if you have start_color, as a function or macro.]) AH_TEMPLATE([HAVE_TYPEAHEAD], @@ -87,96 +56,36 @@ AH_TEMPLATE([ICONV_NONTRANS], [Define as 1 if iconv() only converts exactly and we should treat all return values other than (size_t)(-1) as equivalent.]) -MUTT_C99_INTTYPES +dnl ---------------- sendmail ---------------- ac_aux_path_sendmail=/usr/sbin:/usr/lib AC_PATH_PROG(SENDMAIL, sendmail, /usr/sbin/sendmail, $PATH:$ac_aux_path_sendmail) AC_DEFINE_UNQUOTED(SENDMAIL,"$ac_cv_path_SENDMAIL",[ Where to find sendmail on your system. ]) -OPS='$(srcdir)/OPS' - - AC_ARG_ENABLE(gpgme, AC_HELP_STRING([--enable-gpgme], [Enable GPGME support]), - [ if test x$enableval = xyes; then - have_gpgme=yes - fi - ]) - AC_ARG_WITH(gpgme-prefix, AC_HELP_STRING([--with-gpgme-prefix=PFX], [prefix where GPGME is installed (optional)]), - gpgme_config_prefix="$withval", gpgme_config_prefix="") - - if test x$have_gpgme = xyes; then - if test x$gpgme_config_prefix != x; then - GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config" - else - AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no) - fi - if test "x$GPGME_CONFIG" = "xno"; then - AC_MSG_ERROR([GPGME not found]) - else - LIBGPGME_CFLAGS=`$GPGME_CONFIG --cflags` - LIBGPGME_LIBS=`$GPGME_CONFIG --libs` - MUTTLIBS="$MUTTLIBS $LIBGPGME_LIBS" - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS crypt-gpgme.o crypt-mod-pgp-gpgme.o crypt-mod-smime-gpgme.o" - AC_DEFINE(CRYPT_BACKEND_GPGME, 1, - [Defined, if GPGME support is enabled]) - fi - fi - AC_SUBST(LIBGPGME_CFLAGS) - AC_SUBST(LIBGPGME_LIBS) - - AC_ARG_ENABLE(pgp, AC_HELP_STRING([--disable-pgp], [Disable PGP support]), - [ if test x$enableval = xno ; then - have_pgp=no - fi - ]) +dnl ---------------- gpgme ---------------- - 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(gpgme, AC_HELP_STRING([--enable-gpgme], [Enable GPGME support]),[ + if test x$enableval = xyes; then + AM_PATH_GPGME(,,[AC_MSG_ERROR(GPGME not found)]) + MUTTLIBS="$MUTTLIBS $GPGME_LIBS" + AC_DEFINE(CRYPT_BACKEND_GPGME, 1, [Defined, if GPGME support is enabled]) + AM_CONDITIONAL(BUILD_GPGME, true) + else + AM_CONDITIONAL(BUILD_GPGME, false) + 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 - - AC_ARG_WITH(mixmaster, AC_HELP_STRING([--with-mixmaster[=PATH]], [Include Mixmaster support]), - [if test -x "$withval" ; then - MIXMASTER="$withval" - else - MIXMASTER="mixmaster" - fi - OPS="$OPS \$(srcdir)/OPS.MIX" - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS remailer.o" - AC_DEFINE_UNQUOTED(MIXMASTER,"$MIXMASTER", - [ Where to find mixmaster on your system. ]) - ]) - -# We now require all OPS -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(MIXMASTER, mixmaster, mixmaster) +AC_DEFINE_UNQUOTED(MIXMASTER,"$MIXMASTER",[Where to find mixmaster on your system.]) AC_PATH_PROG(ISPELL, ispell, no) if test $ISPELL != no; then - AC_DEFINE_UNQUOTED(ISPELL,"$ISPELL",[ Where to find ispell on your system. ]) + AC_DEFINE_UNQUOTED(ISPELL,"$ISPELL",[Where to find ispell on your system.]) fi AC_ARG_WITH(slang, AC_HELP_STRING([--with-slang[=DIR]], [Use S-Lang instead of ncurses]), - [AC_CACHE_CHECK([if this is a BSD system], mutt_cv_bsdish, - [AC_TRY_RUN([#include + [AC_CACHE_CHECK([if this is a BSD system], mutt_cv_bsdish, + [AC_TRY_RUN([#include main () { @@ -186,104 +95,95 @@ main () exit (1); #endif }], - mutt_cv_bsdish=yes, - mutt_cv_bsdish=no, - mutt_cv_bsdish=no)]) + mutt_cv_bsdish=yes, + mutt_cv_bsdish=no, + mutt_cv_bsdish=no)]) AC_MSG_CHECKING(for S-Lang) if test $withval = yes; then - if test -d $srcdir/../slang; then - mutt_cv_slang=$srcdir/../slang/src - CFLAGS="$CFLAGS -I${mutt_cv_slang}" - LDFLAGS="$LDFLAGS -L${mutt_cv_slang}/objs" - else - if test -d $mutt_cv_prefix/include/slang; then - CFLAGS="$CFLAGS -I$mutt_cv_prefix/include/slang" - elif test -d /usr/include/slang; then - CFLAGS="$CFLAGS -I/usr/include/slang" - fi - mutt_cv_slang=yes + if test -d $srcdir/../slang; then + mutt_cv_slang=$srcdir/../slang/src + CFLAGS="$CFLAGS -I${mutt_cv_slang}" + LDFLAGS="$LDFLAGS -L${mutt_cv_slang}/objs" + else + if test -d ${prefix}/include/slang; then + CFLAGS="$CFLAGS -I${prefix}/include/slang" + elif test -d /usr/include/slang; then + CFLAGS="$CFLAGS -I/usr/include/slang" fi + mutt_cv_slang=yes + fi else - dnl ---Check to see if $withval is a source directory - if test -f $withval/src/slang.h; then - mutt_cv_slang=$withval/src - CFLAGS="$CFLAGS -I${mutt_cv_slang}" - LDFLAGS="$LDFLAGS -L${mutt_cv_slang}/objs" - else - dnl ---Must be installed somewhere - mutt_cv_slang=$withval - if test -d $withval/include/slang; then - CFLAGS="$CFLAGS -I${withval}/include/slang" - elif test -d $withval/include; then - CFLAGS="$CFLAGS -I${withval}/include" - fi - LDFLAGS="$LDFLAGS -L${withval}/lib" + dnl ---Check to see if $withval is a source directory + if test -f $withval/src/slang.h; then + mutt_cv_slang=$withval/src + CFLAGS="$CFLAGS -I${mutt_cv_slang}" + LDFLAGS="$LDFLAGS -L${mutt_cv_slang}/objs" + else + dnl ---Must be installed somewhere + mutt_cv_slang=$withval + if test -d $withval/include/slang; then + CFLAGS="$CFLAGS -I${withval}/include/slang" + elif test -d $withval/include; then + CFLAGS="$CFLAGS -I${withval}/include" fi + LDFLAGS="$LDFLAGS -L${withval}/lib" + fi fi AC_MSG_RESULT($mutt_cv_slang) if test $mutt_cv_bsdish = yes; then - AC_CHECK_LIB(termlib, main) + AC_CHECK_LIB(termlib, main) fi - AC_DEFINE(USE_SLANG_CURSES,1, - [ Define if you compile with SLang instead of curses/ncurses. ]) + AC_DEFINE(USE_SLANG_CURSES,1, [ Define if you compile with SLang instead of curses/ncurses. ]) AC_DEFINE(HAVE_COLOR,1,[ Define if your curses library supports color. ]) - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS resize.o" dnl --- now that we've found it, check the link AC_CHECK_LIB(slang, SLtt_get_terminfo, - [MUTTLIBS="$MUTTLIBS -lslang -lm"], - [AC_MSG_ERROR(unable to compile. check config.log)], -lm) - - ], + [MUTTLIBS="$MUTTLIBS -lslang -lm"], + [AC_MSG_ERROR(unable to compile. check config.log)], -lm) + ], + [ mutt_cv_curses=/usr + AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses=DIR], [Where ncurses is installed]), [ + if test $withval != yes; then + mutt_cv_curses=$withval + fi + if test x$mutt_cv_curses != x/usr; then + LDFLAGS="-L${mutt_cv_curses}/lib $LDFLAGS" + CPPFLAGS="$CPPFLAGS -I${mutt_cv_curses}/include" + fi + ]) - [mutt_cv_curses=/usr - AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses=DIR], [Where ncurses is installed]), - [if test $withval != yes; then - mutt_cv_curses=$withval - fi - if test x$mutt_cv_curses != x/usr; then - LDFLAGS="-L${mutt_cv_curses}/lib $LDFLAGS" - CPPFLAGS="$CPPFLAGS -I${mutt_cv_curses}/include" - fi]) - - AC_CHECK_FUNC(initscr,,[ - cf_ncurses="ncurses" - for lib in ncursesw ncurses - do - AC_CHECK_LIB($lib, waddnwstr, [cf_ncurses="$lib"; break]) - done + AC_CHECK_FUNC(initscr,,[ + cf_ncurses="ncurses" + for lib in ncursesw ncurses; do + AC_CHECK_LIB($lib, waddnwstr, [cf_ncurses="$lib"; break]) + done AC_CHECK_LIB($cf_ncurses, initscr, - [MUTTLIBS="$MUTTLIBS -l$cf_ncurses" + [ MUTTLIBS="$MUTTLIBS -l$cf_ncurses" if test x$mutt_cv_curses = x/usr -a -d /usr/include/ncurses; then - CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses" + CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses" fi - - if test "$cf_ncurses" = ncursesw; then - AC_CHECK_HEADERS(ncurses/ncurses.h,[cf_cv_ncurses_header="ncurses/ncurses.h"]) - AC_CHECK_HEADERS(ncursesw/ncurses.h,[cf_cv_ncurses_header="ncursesw/ncurses.h"]) - else - AC_CHECK_HEADERS(ncurses.h,[cf_cv_ncurses_header="ncurses.h"]) - fi], - [CF_CURSES_LIBS]) - ]) + if test "$cf_ncurses" = ncursesw; then + AC_CHECK_HEADERS(ncurses/ncurses.h,[cf_cv_ncurses_header="ncurses/ncurses.h"]) + AC_CHECK_HEADERS(ncursesw/ncurses.h,[cf_cv_ncurses_header="ncursesw/ncurses.h"]) + else + AC_CHECK_HEADERS(ncurses.h,[cf_cv_ncurses_header="ncurses.h"]) + fi + ], + [CF_CURSES_LIBS]) + ]) old_LIBS="$LIBS" LIBS="$LIBS $MUTTLIBS" CF_CHECK_FUNCDECLS([#include <${cf_cv_ncurses_header-curses.h}>], [start_color typeahead bkgdset curs_set meta use_default_colors resizeterm]) if test "$ac_cv_func_decl_start_color" = yes; then - AC_DEFINE(HAVE_COLOR,1,[ Define if your curses library supports color. ]) - fi - if test "$ac_cv_func_decl_resizeterm" = yes; then - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS resize.o" + AC_DEFINE(HAVE_COLOR,1,[ Define if your curses library supports color. ]) fi LIBS="$old_LIBS" - ]) - -AC_HEADER_STDC + ]) AC_CHECK_HEADERS(stdarg.h sys/ioctl.h ioctl.h sysexits.h) AC_CHECK_HEADERS(sys/time.h sys/resource.h) @@ -295,24 +195,16 @@ AC_TYPE_SIGNAL AC_MSG_CHECKING(for sig_atomic_t in signal.h) AC_EGREP_HEADER(sig_atomic_t,signal.h, - [ - ac_cv_type_sig_atomic_t=yes; - AC_EGREP_HEADER(volatile.*sig_atomic_t, - signal.h, - [ - is_sig_atomic_t_volatile=yes; - AC_MSG_RESULT([yes, volatile]) - ], - [ - is_sig_atomic_t_volatile=no; - AC_MSG_RESULT([yes, non volatile]) - ]) - ], - [ - AC_MSG_RESULT(no) - AC_CHECK_TYPE(sig_atomic_t, int) - is_sig_atomic_t_volatile=no - ]) + [ ac_cv_type_sig_atomic_t=yes; + AC_EGREP_HEADER(volatile.*sig_atomic_t, + signal.h, + [is_sig_atomic_t_volatile=yes; AC_MSG_RESULT([yes, volatile])], + [is_sig_atomic_t_volatile=no; AC_MSG_RESULT([yes, non volatile])]) + ], + [ AC_MSG_RESULT(no) + AC_CHECK_TYPE(sig_atomic_t, int) + is_sig_atomic_t_volatile=no + ]) if test $is_sig_atomic_t_volatile = 'yes' then AC_DEFINE(SIG_ATOMIC_VOLATILE_T, sig_atomic_t) @@ -321,87 +213,55 @@ else 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) -AC_CHECK_FUNCS(snprintf vsnprintf) AC_CHECK_FUNC(getopt) if test $ac_cv_func_getopt = yes; then - AC_CHECK_HEADERS(getopt.h) + 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)]) - -if test $mutt_cv_regex = no ; then -AC_CACHE_CHECK([whether your system's regexp library is completely broken], - [mutt_cv_regex_broken], - AC_TRY_RUN([ -#include -#include -main() { regex_t blah ; regmatch_t p; p.rm_eo = p.rm_eo; return regcomp(&blah, "foo.*bar", REG_NOSUB) || regexec (&blah, "foobar", 0, NULL, 0); }], - mutt_cv_regex_broken=no, mutt_cv_regex_broken=yes, mutt_cv_regex_broken=yes)) - if test $mutt_cv_regex_broken = yes ; then - echo "Using the included GNU regex instead." >&AC_FD_MSG - mutt_cv_regex=yes - fi +AC_CHECK_FUNC(regcomp) +if test $ac_cv_func_regcomp = yes; then + AC_CHECK_HEADERS(regex.h) 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) -fi - - AC_ARG_WITH(homespool, - AC_HELP_STRING([--with-homespool[=FILE]], [File in user's directory where new mail is spooled]), with_homespool=${withval}) + AC_HELP_STRING([--with-homespool[=FILE]], + [File in user's directory where new mail is spooled]), + with_homespool=${withval}) if test x$with_homespool != x; then - if test $with_homespool = yes; then - with_homespool=mailbox - fi - AC_DEFINE_UNQUOTED(MAILPATH,"$with_homespool",[ Where new mail is spooled. ]) - AC_DEFINE(HOMESPOOL,1, - [Is mail spooled to the user's home directory? If defined, - MAILPATH should be set to the filename of the spool mailbox - relative the the home directory. - use: configure --with-homespool=FILE]) - AC_DEFINE(USE_DOTLOCK,1,[ Define to use dotlocking for mailboxes. ]) - mutt_cv_setgid=no + if test $with_homespool = yes; then + with_homespool=mailbox + fi + AC_DEFINE_UNQUOTED(MAILPATH,"$with_homespool",[ Where new mail is spooled. ]) + AC_DEFINE(HOMESPOOL,1, + [ Is mail spooled to the user's home directory? If defined, + MAILPATH should be set to the filename of the spool mailbox + relative the the home directory. + use: configure --with-homespool=FILE + ]) + mutt_cv_setgid=no else - AC_ARG_WITH(mailpath, AC_HELP_STRING([--with-mailpath=DIR], [Directory where spool mailboxes are located]), - [mutt_cv_mailpath=$withval], - [ AC_CACHE_CHECK(where new mail is stored, mutt_cv_mailpath, - [mutt_cv_mailpath=no - if test -d /var/mail; then - mutt_cv_mailpath=/var/mail - elif test -d /var/spool/mail; then - mutt_cv_mailpath=/var/spool/mail - elif test -d /usr/spool/mail; then - mutt_cv_mailpath=/usr/spool/mail - elif test -d /usr/mail; then - mutt_cv_mailpath=/usr/mail - fi]) - ]) - if test "$mutt_cv_mailpath" = no; then - AC_MSG_ERROR("Could not determine where new mail is stored.") - fi - AC_DEFINE_UNQUOTED(MAILPATH,"$mutt_cv_mailpath",[ Where new mail is spooled. ]) + AC_ARG_WITH(mailpath, AC_HELP_STRING([--with-mailpath=DIR], [Directory where spool mailboxes are located]), + [mutt_cv_mailpath=$withval], + [ AC_CACHE_CHECK(where new mail is stored, mutt_cv_mailpath, + [mutt_cv_mailpath=no + if test -d /var/mail; then + mutt_cv_mailpath=/var/mail + elif test -d /var/spool/mail; then + mutt_cv_mailpath=/var/spool/mail + elif test -d /usr/spool/mail; then + mutt_cv_mailpath=/usr/spool/mail + elif test -d /usr/mail; then + mutt_cv_mailpath=/usr/mail + fi]) + ]) + if test "$mutt_cv_mailpath" = no; then + AC_MSG_ERROR("Could not determine where new mail is stored.") + fi + AC_DEFINE_UNQUOTED(MAILPATH,"$mutt_cv_mailpath",[ Where new mail is spooled. ]) - AC_CACHE_CHECK(if $mutt_cv_mailpath is world writable, mutt_cv_worldwrite, [AC_TRY_RUN([#include + AC_CACHE_CHECK(if $mutt_cv_mailpath is world writable, mutt_cv_worldwrite, [AC_TRY_RUN([#include #include int main (int argc, char **argv) @@ -414,10 +274,7 @@ int main (int argc, char **argv) }], mutt_cv_worldwrite=yes, mutt_cv_worldwrite=no, mutt_cv_worldwrite=no)]) mutt_cv_setgid=no - if test $mutt_cv_worldwrite = yes; then - AC_DEFINE(USE_DOTLOCK,1,[ Define to use dotlocking for mailboxes. ]) - else - + if test $mutt_cv_worldwrite != yes; then AC_CACHE_CHECK(if $mutt_cv_mailpath is group writable, mutt_cv_groupwrite, [AC_TRY_RUN([#include #include @@ -430,254 +287,140 @@ int main (int argc, char **argv) exit (1); }], mutt_cv_groupwrite=yes, mutt_cv_groupwrite=no, mutt_cv_groupwrite=no)]) - if test $mutt_cv_groupwrite = yes; then - AC_DEFINE(USE_DOTLOCK,1,[ Define to use dotlocking for mailboxes. ]) - AC_DEFINE(USE_SETGID,1,[ Define if mutt should run setgid "mail". ]) - mutt_cv_setgid=yes - fi + if test $mutt_cv_groupwrite = yes; then + AC_DEFINE(USE_SETGID,1,[ Define if mutt should run setgid "mail". ]) + mutt_cv_setgid=yes fi + fi fi -AC_ARG_ENABLE(external_dotlock, AC_HELP_STRING([--enable-external-dotlock], [Force use of an external dotlock program]), - [mutt_cv_external_dotlock="$enableval"]) - -if test "x$mutt_cv_setgid" = "xyes" || test "x$mutt_cv_fchdir" = "xno" \ - || test "x$mutt_cv_external_dotlock" = "xyes" -then - AC_DEFINE(DL_STANDALONE,1,[ Define if you want to use an external dotlocking program. ]) - DOTLOCK_TARGET="muttng_dotlock" -else - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS dotlock.o" -fi - -AC_SUBST(DOTLOCK_TARGET) - - AC_MSG_CHECKING(where to put the documentation) AC_ARG_WITH(docdir, AC_HELP_STRING([--with-docdir=PATH], [Specify where to put the documentation]), [mutt_cv_docdir=$withval], - [mutt_cv_docdir="${prefix}/doc/muttng"]) + [mutt_cv_docdir="${prefix}/doc/madmutt"]) AC_MSG_RESULT($mutt_cv_docdir) docdir=$mutt_cv_docdir AC_SUBST(docdir) if test x$mutt_cv_setgid = xyes; then - DOTLOCK_GROUP='mail' - DOTLOCK_PERMISSION=2755 + DOTLOCK_GROUP='mail' + DOTLOCK_PERMISSION=2755 else - DOTLOCK_GROUP='' - DOTLOCK_PERMISSION=755 + DOTLOCK_GROUP='' + DOTLOCK_PERMISSION=755 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 +AC_ARG_ENABLE(nntp, AC_HELP_STRING([--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" + 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 -- -AC_ARG_WITH(gss, AC_HELP_STRING([--with-gss[=PFX]], [Compile in GSSAPI authentication for IMAP]), - 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) - if test "$GSSAPI_IMPL" = "none" - then - AC_CACHE_SAVE - AC_MSG_RESULT([GSSAPI libraries not found]) - fi - if test "$GSSAPI_IMPL" = "Heimdal" - then - AC_DEFINE(HAVE_HEIMDAL,1,[ Define if your GSSAPI implementation is Heimdal ]) +AC_ARG_WITH(gss, AC_HELP_STRING([--with-gss], [Compile in GSSAPI authentication for IMAP]),[ + if test x$with_gss != xno; then + PKG_CHECK_MODULES(GSSAPI,libgssapi,[ + CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS" + MUTTLIBS="$MUTTLIBS $GSSAPI_LIBS" + AC_DEFINE(USE_GSS,1,[ Define if you have GSSAPI libraries available ]) + AC_CHECK_HEADERS(xom.h) + ],[ + AC_MSG_ERROR([could not find libgssapi]) + ]) fi - CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS" - 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) - -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" - CPPFLAGS="$CPPFLAGS -I$withval/include" - fi - saved_LIBS="$LIBS" - - AC_CHECK_LIB(crypto, X509_new,, AC_MSG_ERROR([Unable to find SSL library])) - AC_CHECK_LIB(ssl, SSL_new,, AC_MSG_ERROR([Unable to find SSL library]), -lcrypto) +[ if test "$with_ssl" != "no"; then + if test "$with_ssl" != "yes"; then + LDFLAGS="$LDFLAGS -L$withval/lib" + CPPFLAGS="$CPPFLAGS -I$withval/include" + fi + saved_LIBS="$LIBS" - AC_CHECK_FUNCS(RAND_status RAND_egd) + AC_CHECK_LIB(crypto, X509_new,, AC_MSG_ERROR([Unable to find SSL library])) + AC_CHECK_LIB(ssl, SSL_new,, AC_MSG_ERROR([Unable to find SSL library]), -lcrypto) - AC_DEFINE(USE_SSL,1,[ Define if you want support for SSL. ]) - LIBS="$saved_LIBS" - MUTTLIBS="$MUTTLIBS -lssl -lcrypto" - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl.o" - need_ssl=yes + AC_CHECK_FUNCS(RAND_status RAND_egd) - fi + AC_DEFINE(USE_SSL,1,[ Define if you want support for SSL. ]) + LIBS="$saved_LIBS" + MUTTLIBS="$MUTTLIBS -lssl -lcrypto" + need_ssl=yes + fi ]) -AC_ARG_WITH([gnutls], AC_HELP_STRING([--with-gnutls[=PFX]], [Enable SSL support using gnutls]), - [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]) - fi - MUTT_AM_PATH_GNUTLS([$gnutls_prefix], - [dnl GNUTLS found - CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS" - MUTTLIBS="$MUTTLIBS $LIBGNUTLS_LIBS" - AC_DEFINE(USE_GNUTLS, 1, [Define if you want support for SSL via the gnutls library.]) - - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl_gnutls.o" - need_ssl=yes], - [dnl GNUTLS not found - AC_MSG_ERROR([could not find libgnutls]) +AC_ARG_WITH([gnutls], AC_HELP_STRING([--with-gnutls], [Enable SSL support using gnutls]), + [gnutls_prefix="$withval"], [gnutls_prefix="no"]) +if test "$gnutls_prefix" != "no"; then + if test x"$need_ssl" = x"yes"; then + AC_MSG_ERROR([Only either OpenSSL or GNUTLS may be used]) + fi + AM_PATH_LIBGNUTLS(,[ + CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS" + MUTTLIBS="$MUTTLIBS $LIBGNUTLS_LIBS" + AC_DEFINE(USE_GNUTLS, 1, [Define if you want support for SSL via the gnutls library.]) + need_ssl=yes], + [AC_MSG_ERROR([could not find libgnutls]) ]) fi - AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes) +AC_SUBST(MUTT_SSL_OBJECTS) -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" - then +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"; then + if test "$with_sasl2" != "yes"; then CPPFLAGS="$CPPFLAGS -I$with_sasl2/include" LDFLAGS="$LDFLAGS -L$with_sasl2/lib" - fi + fi - saved_LIBS="$LIBS" + saved_LIBS="$LIBS" - AC_CHECK_LIB(sasl2, sasl_client_init,, - AC_MSG_ERROR([could not find libsasl2]),) + AC_CHECK_LIB(sasl2, sasl_client_init,,AC_MSG_ERROR([could not find libsasl2])) - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_sasl.o" - MUTTLIBS="$MUTTLIBS -lsasl2" - LIBS="$saved_LIBS" - AC_DEFINE(USE_SASL,1, - [ Define if want to use version 2 of the Cyrus SASL library. ]) - need_sasl=yes - fi - ]) + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_sasl.o" + MUTTLIBS="$MUTTLIBS -lsasl2" + LIBS="$saved_LIBS" + AC_DEFINE(USE_SASL,1, + [Define if want to use version 2 of the Cyrus SASL library.]) + need_sasl=yes + fi +]) AM_CONDITIONAL(USE_SASL, test x$need_sasl = xyes) -AC_ARG_WITH(idn, AC_HELP_STRING([--with-idn=[PFX]], [Use GNU libidn for domain names]), - [ - if test "$with_idn" != "no" ; then - if test "$with_idn" != "yes" ; then - CPPFLAGS="$CPPFLAGS -I$with_idn/include" - LDFLAGS="$LDFLAGS -L$with_idn/lib" - fi - fi - ] -) - -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) -fi +AC_ARG_WITH(idn, AC_HELP_STRING([--with-idn], [Use GNU libidn for domain names]),[ + if test x$with_idn != xno ; then + PKG_CHECK_MODULES(IDN,libidn,[ + if $PKG_CONFIG --atleast-version=0.6; then + AC_MSG_ERROR([libidn is too old, want 0.6 at least]) + fi + CPPFLAGS="$CPPFLAGS $IDN_CFLAGS" + LDFLAGS="$LDFLAGS $IDN_LIBS" + ],[AC_MSG_ERROR([could not find libidn])]) + 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 - ]) - AC_ARG_ENABLE(flock, AC_HELP_STRING([--enable-flock], [Use flock() to lock files]), [if test $enableval = yes; then AC_DEFINE(USE_FLOCK,1, [ Define to use flock() to lock mailboxes. ]) @@ -700,63 +443,6 @@ 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 @@ -771,31 +457,15 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching]) AC_ARG_WITH(qdbm, AC_HELP_STRING([--without-qdbm], [Don't use qdbm even if it is available]), ac_prefer_qdbm=$withval) if test x$ac_prefer_qdbm != xno; then - ac_cv_vlopen=no - QDBM_DIRS="$mutt_cv_prefix /usr/local /usr" - AC_MSG_CHECKING([for vlopen]) - for d in $QDBM_DIRS; do - if test x$ac_cv_vlopen = xno && test -d "$d/include" && test -d "$d/lib"; then - QDBM_INC="-I$d/include" - QDBM_LIB="-L$d/lib" - CPPFLAGS="$OLDCPPFLAGS $QDBM_INC" - LIBS="$OLDLIBS $QDBM_LIB -lqdbm" - AC_TRY_LINK([#include ],[vlopen(0,0,0);],[ac_cv_vlopen=yes]) - fi - done - if test x$ac_cv_vlopen = xyes; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi + PKG_CHECK_MODULES(QDBM,qdbm,[ac_qdbm_here=yes],[ac_qdbm_here=no]) fi ac_prefer_gdbm=yes AC_ARG_WITH(gdbm, AC_HELP_STRING([--without-gdbm], [Don't use gdbm even if it is available]), ac_prefer_gdbm=$withval) - if test x$ac_prefer_gdbm != xno -a x$ac_cv_vlopen != xyes; then + if test x$ac_prefer_gdbm != xno -a x$ac_qdbm_here != xyes; then ac_cv_gdbmopen=no - GDBM_DIRS="$mutt_cv_prefix /usr/local /usr" + GDBM_DIRS="${prefix} /usr/local /usr" AC_MSG_CHECKING([for gdbm_open]) for d in $GDBM_DIRS; do if test x$ac_cv_gdbmopen = xno && test -d "$d/include" && test -d "$d/lib"; then @@ -812,12 +482,12 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching]) AC_MSG_RESULT(no) fi fi - + ac_bdb_prefix=yes AC_ARG_WITH(bdb, AC_HELP_STRING([--with-bdb[=DIR]], [Use BerkeleyDB4 if gdbm is not available ]), ac_bdb_prefix=$withval) - if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes -a x$ac_cv_vlopen != xyes; then - test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr" + if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes -a x$ac_qdbm_here != xyes; then + test x$ac_bdb_prefix = xyes && ac_bdb_prefix="${prefix} /opt/csw/bdb4 /opt /usr/local /usr" for d in $ac_bdb_prefix; do bdbpfx="$bdbpfx $d" for v in BerkeleyDB.4.3 BerkeleyDB.4.2 BerkeleyDB.4.1; do @@ -862,9 +532,9 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching]) fi fi - if test x$ac_cv_vlopen = xyes; then - CPPFLAGS="$OLDCPPFLAGS $QDBM_INC" - LIBS="$OLDLIBS $QDBM_LIB -lqdbm" + if test x$ac_qdbm_here = xyes; then + CPPFLAGS="$OLDCPPFLAGS $QDBM_CFLAGS" + LIBS="$OLDLIBS $QDBM_LIBS" AC_DEFINE(HAVE_QDBM, 1, [QDBM Support]) elif test x$ac_cv_gdbmopen = xyes; then CPPFLAGS="$OLDCPPFLAGS $GDBM_INC" @@ -882,10 +552,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) @@ -899,12 +565,11 @@ AC_ARG_ENABLE(iconv, AC_HELP_STRING([--disable-iconv], [Disable iconv support]), AM_GNU_GETTEXT -if test "$am_cv_func_iconv" != "yes" -then - AC_MSG_WARN([Configuring without iconv support. See INSTALL for details]) +if test "$am_cv_func_iconv" != "yes"; then + AC_MSG_WARN([Configuring without iconv support. See INSTALL for details]) else -AC_CHECK_HEADERS(iconv.h, + AC_CHECK_HEADERS(iconv.h, [AC_MSG_CHECKING(whether iconv.h defines iconv_t) AC_EGREP_HEADER([typedef.*iconv_t],iconv.h, [AC_MSG_RESULT(yes) @@ -912,13 +577,13 @@ AC_CHECK_HEADERS(iconv.h, [Define if defines iconv_t.])], AC_MSG_RESULT(no))]) -dnl (1) Some implementations of iconv won't convert from UTF-8 to UTF-8. -dnl (2) In glibc-2.1.2 and earlier there is a bug that messes up ob and -dnl obl when args 2 and 3 are 0 (fixed in glibc-2.1.3). -AC_CACHE_CHECK([whether this iconv is good enough], mutt_cv_iconv_good, - mutt_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" - AC_TRY_RUN([ + dnl (1) Some implementations of iconv won't convert from UTF-8 to UTF-8. + dnl (2) In glibc-2.1.2 and earlier there is a bug that messes up ob and + dnl obl when args 2 and 3 are 0 (fixed in glibc-2.1.3). + AC_CACHE_CHECK([whether this iconv is good enough], mutt_cv_iconv_good, + mutt_save_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + AC_TRY_RUN([ #include int main() { @@ -934,160 +599,43 @@ changequote([, ])dnl !(ob == buf && obl == sizeof(buf)) || iconv_close(cd))); } - ], - mutt_cv_iconv_good=yes, - mutt_cv_iconv_good=no, - mutt_cv_iconv_good=yes) - LIBS="$mutt_save_LIBS") -if test "$mutt_cv_iconv_good" = no; then - AC_MSG_ERROR(Try using libiconv instead) -fi - -dnl This is to detect implementations such as the one in glibc-2.1, -dnl which always convert exactly but return the number of characters -dnl converted instead of the number converted inexactly. -AC_CACHE_CHECK([whether iconv is non-transcribing], mutt_cv_iconv_nontrans, - mutt_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" - AC_TRY_RUN([ -#include -#include -int main() -{ - iconv_t cd; - const char *ib; - char *ob; - size_t ibl, obl; - const char *s = "\304\211"; -changequote(, )dnl - char t[3]; -changequote([, ])dnl - ib = s, ibl = 2, ob = t, obl = 3; - return ((cd = iconv_open("UTF-8", "UTF-8")) == (iconv_t)(-1) || - iconv(cd, &ib, &ibl, &ob, &obl)); -} - ], - mutt_cv_iconv_nontrans=no, - mutt_cv_iconv_nontrans=yes, - mutt_cv_iconv_nontrans=no) - LIBS="$mutt_save_LIBS") -if test "$mutt_cv_iconv_nontrans" = yes; then - AC_DEFINE(ICONV_NONTRANS, 1) -else - AC_DEFINE(ICONV_NONTRANS, 0) -fi - -CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/intl" - -if test "$BUILD_INCLUDED_LIBINTL" = "yes"; then - AC_DEFINE(HAVE_BIND_TEXTDOMAIN_CODESET,1, - [ Define if your gettext has bind_textdomain_codeset. ]) -else - AC_CHECK_FUNCS(bind_textdomain_codeset) -fi + ], + mutt_cv_iconv_good=yes, + mutt_cv_iconv_good=no, + mutt_cv_iconv_good=yes) + LIBS="$mutt_save_LIBS") + if test "$mutt_cv_iconv_good" = no; then + AC_MSG_ERROR(Try using libiconv instead) + fi fi # libiconv dnl -- locales -- -AC_CHECK_HEADERS(wchar.h) - -AC_CACHE_CHECK([for wchar_t], mutt_cv_wchar_t, - AC_TRY_COMPILE([ -#include -#include -#ifdef HAVE_WCHAR_H -#include -#endif - ], - [ wchar_t wc; return 0; ], - mutt_cv_wchar_t=yes, - mutt_cv_wchar_t=no)) - -if test "$mutt_cv_wchar_t" = no; then - AC_DEFINE(wchar_t,int,[ Define to 'int' if system headers don't define. ]) -fi - -AC_CACHE_CHECK([for wint_t], mutt_cv_wint_t, - AC_TRY_COMPILE([ -#include -#include -#ifdef HAVE_WCHAR_H -#include -#endif - ], - [ wint_t wc; return 0; ], - mutt_cv_wint_t=yes, - mutt_cv_wint_t=no)) - -if test "$mutt_cv_wint_t" = no; then - AC_DEFINE(wint_t,int,[ Define to 'int' if system headers don't define. ]) -fi - -AC_CHECK_HEADERS(wctype.h) +AC_CHECK_HEADERS(locale.h wchar.h wctype.h) AC_CHECK_FUNCS(iswalnum iswalpha iswcntrl iswdigit) AC_CHECK_FUNCS(iswgraph iswlower iswprint iswpunct iswspace iswupper) AC_CHECK_FUNCS(iswxdigit towupper towlower) - -AC_CACHE_CHECK([for mbstate_t], mutt_cv_mbstate_t, - AC_TRY_COMPILE([ -#include -#include -#ifdef HAVE_WCHAR_H -#include -#endif - ], - [ mbstate_t s; return 0; ], - mutt_cv_mbstate_t=yes, - mutt_cv_mbstate_t=no)) - -if test "$mutt_cv_mbstate_t" = no; then - AC_DEFINE(mbstate_t,int,[ Define to 'int' if system headers don't define. ]) -fi - -wc_funcs=maybe -AC_ARG_WITH(wc-funcs, AC_HELP_STRING([--without-wc-funcs], [Do not use the system's wchar_t functions]), - wc_funcs=$withval) - -if test "$wc_funcs" != yes -a "$wc_funcs" != no; then - AC_CACHE_CHECK([for wchar_t functions], mutt_cv_wc_funcs, - mutt_cv_wc_funcs=no - AC_TRY_LINK([ -#define _XOPEN_SOURCE 1 -#include -#include -#ifdef HAVE_WCTYPE_H -#include -#endif -#ifdef HAVE_WCHAR_H -#include -#endif], - [mbrtowc(0, 0, 0, 0); wctomb(0, 0); wcwidth(0); - iswprint(0); iswspace(0); towlower(0); towupper(0); iswalnum(0)], - mutt_cv_wc_funcs=yes)) - wc_funcs=$mutt_cv_wc_funcs -fi - -if test $wc_funcs = yes; then - AC_DEFINE(HAVE_WC_FUNCS,1,[ Define if you are using the system's wchar_t functions. ]) -fi +AC_TYPE_MBSTATE_T AC_CACHE_CHECK([for nl_langinfo and CODESET], mutt_cv_langinfo_codeset, - [AC_TRY_LINK([#include ], - [char* cs = nl_langinfo(CODESET);], - mutt_cv_langinfo_codeset=yes, - mutt_cv_langinfo_codeset=no)]) + [AC_TRY_LINK([#include ], + [char* cs = nl_langinfo(CODESET);], + mutt_cv_langinfo_codeset=yes, + mutt_cv_langinfo_codeset=no)]) if test $mutt_cv_langinfo_codeset = yes; then - AC_DEFINE(HAVE_LANGINFO_CODESET,1,[ Define if you have and nl_langinfo(CODESET). ]) + AC_DEFINE(HAVE_LANGINFO_CODESET,1, + [Define if you have and nl_langinfo(CODESET).]) fi AC_CACHE_CHECK([for nl_langinfo and YESEXPR], mutt_cv_langinfo_yesexpr, - [AC_TRY_LINK([#include ], - [char* cs = nl_langinfo(YESEXPR);], - mutt_cv_langinfo_yesexpr=yes, - mutt_cv_langinfo_yesexpr=no)]) + [AC_TRY_LINK([#include ], + [char* cs = nl_langinfo(YESEXPR);], + mutt_cv_langinfo_yesexpr=yes, + mutt_cv_langinfo_yesexpr=no)]) if test $mutt_cv_langinfo_yesexpr = yes; then - AC_DEFINE(HAVE_LANGINFO_YESEXPR,1,[ Define if you have and nl_langinfo(YESEXPR). ]) + AC_DEFINE(HAVE_LANGINFO_YESEXPR,1, + [Define if you have and nl_langinfo(YESEXPR).]) fi dnl -- libesmtp -- @@ -1096,10 +644,7 @@ if test x$use_libesmtp = xyes; then CFLAGS="$CFLAGS $mutt_libesmtp_cflags" MUTTLIBS="$MUTTLIBS $mutt_libesmtp_libs" MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_libesmtp.o" - - AC_DEFINE(USE_LIBESMTP, - 1, - [Define to enable the use of libesmtp]) + AC_DEFINE(USE_LIBESMTP, 1, [Define to enable the use of libesmtp]) fi dnl -- end libesmtp -- @@ -1108,37 +653,32 @@ dnl -- sgml tools -- dnl Documentation tools have_openjade="no" AC_PATH_PROG([OSPCAT], [ospcat], [none]) -if test "$OSPCAT" != "none" -then - AC_MSG_CHECKING([for openjade docbook stylesheets]) - dslosfile=`ospcat --public-id="-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN"` - DSLROOT=`echo $dslosfile | sed -n -e "s/.*SOIBASE='\(@<:@^'@:>@*\)\/catalog'.*/\1/p"` - # ospcat may spit out an absolute path without an SOIBASE - if test -z "$DSLROOT" - then - DSLROOT=`echo $dslosfile | sed -e 's|\(.*\)/print/docbook.dsl|\1|'` - fi - if test -f $DSLROOT/print/docbook.dsl - then - AC_MSG_RESULT([in $DSLROOT]) - have_openjade="yes" - else - AC_MSG_RESULT([not found: PDF documentation will not be built.]) - fi +if test "x$OSPCAT" != "xnone"; then + AC_MSG_CHECKING([for openjade docbook stylesheets]) + dslosfile=`ospcat --public-id="-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN"` + DSLROOT=`echo $dslosfile | sed -n -e "s/.*SOIBASE='\(@<:@^'@:>@*\)\/catalog'.*/\1/p"` + # ospcat may spit out an absolute path without an SOIBASE + if test -z "$DSLROOT"; then + DSLROOT=`echo $dslosfile | sed -e 's|\(.*\)/print/docbook.dsl|\1|'` + fi + if test -f $DSLROOT/print/docbook.dsl; then + AC_MSG_RESULT([in $DSLROOT]) + have_openjade="yes" + else + AC_MSG_RESULT([not found: PDF documentation will not be built.]) + fi fi AC_SUBST(DSLROOT) AC_MSG_CHECKING([for lynx]) AC_PATH_PROG([HTML2TXT_CMD], [lynx], [none]) -if test x"$HTML2TXT_CMD" = x"none" -then - AC_MSG_CHECKING([for w3m]) - AC_PATH_PROG([HTML2TXT_CMD], [w3m], [none]) +if test x"$HTML2TXT_CMD" = x"none"; then + AC_MSG_CHECKING([for w3m]) + AC_PATH_PROG([HTML2TXT_CMD], [w3m], [none]) fi -if test x"$HTML2TXT_CMD" = x"none" -then - AC_MSG_CHECKING([for elinks]) - AC_PATH_PROG([HTML2TXT_CMD], [elinks], [none]) +if test x"$HTML2TXT_CMD" = x"none"; then + AC_MSG_CHECKING([for elinks]) + AC_PATH_PROG([HTML2TXT_CMD], [elinks], [none]) fi case "$HTML2TXT_CMD" in *elinks*) @@ -1159,21 +699,57 @@ AC_SUBST(HTML2TXT_CMD) AC_MSG_CHECKING([for tidy]) AC_PATH_PROG([HTMLCLEAN_CMD], [tidy], [none]) -if test x"$HTMLCLEAN_CMD" != x"none" -then - HTMLCLEAN_CMD="$HTMLCLEAN_CMD -q -i -m -asxml -utf8 " +if test x"$HTMLCLEAN_CMD" != x"none"; then + HTMLCLEAN_CMD="$HTMLCLEAN_CMD -q -i -m -asxml -utf8 " else - HTMLCLEAN_CMD="echo " + HTMLCLEAN_CMD="echo " fi AC_SUBST(HTMLCLEAN_CMD) -AC_OUTPUT(Makefile intl/Makefile m4/Makefile - po/Makefile.in doc/Makefile contrib/Makefile - muttbug.sh - lib-lib/Makefile - lib/Makefile - imap/Makefile - pop/Makefile - nntp/Makefile - Muttngrc.head - doc/instdoc.sh) +AC_ARG_ENABLE(doc, + [ --enable-doc build documentation (needs doxygen and LaTeX)]) +# Build documentation? +DOXYGEN="no" +LATEX="no" +if test "${enable_doc}" != "no"; then + AC_PATH_PROG(DOXYGEN, doxygen, no) + if test "${DOXYGEN}" != "no"; then + # Build LaTeX documentation? + AC_PATH_PROG(LATEX, pdflatex, no) + AC_PATH_PROG(DVIPS, dvips, no) + if test "${DVIPS}" = "no"; then + LATEX="no" + fi + AC_MSG_CHECKING(for a4wide.sty) + if test -f /usr/share/texmf/tex/latex/misc/a4wide.sty; then + AC_MSG_RESULT(yes) + elif test -f /usr/share/texmf-tetex/tex/latex/a4wide/a4wide.sty; then + AC_MSG_RESULT(yes) + else + LATEX="no" + AC_MSG_RESULT(no) + fi + fi +fi +AM_CONDITIONAL(BUILD_DOCUMENTATION, test "${DOXYGEN}" != "no") +AM_CONDITIONAL(USE_LATEX, test "${LATEX}" != "no") + +AC_OUTPUT(Makefile + Madmuttrc.head + intl/Makefile + m4/Makefile + po/Makefile.in + apidoc/Makefile apidoc/doxygen.cfg + doc/Makefile doc/instdoc.sh + contrib/Makefile + lib-lib/Makefile + lib-mime/Makefile + lib-crypt/Makefile + lib-hash/Makefile + lib-mx/Makefile + lib-sys/Makefile + lib-ui/Makefile + imap/Makefile + pop/Makefile + nntp/Makefile +)