X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.ac;h=42d180601911a38b1a421fb1e2886189792d1db2;hp=0cb3f9f93b4f9e5ad7df404f395e755de9818704;hb=7d29626ce4e1fa932c6349c7253e6f774df069fc;hpb=10e80e482eff3762b0b8d41b0c7795b76704479c diff --git a/configure.ac b/configure.ac index 0cb3f9f..42d1806 100644 --- a/configure.ac +++ b/configure.ac @@ -16,31 +16,16 @@ ALL_LINGUAS="de ru it es uk fr pl nl cs id sk ko el zh_TW zh_CN pt_BR eo gl sv d 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_CPP AC_PROG_CC_C99 - -AM_C_PROTOTYPES -AC_C_INLINE -AC_C_CONST -if test "x$U" != "x"; then - AC_MSG_ERROR(Compiler not ANSI compliant) -fi AC_ISC_POSIX AC_HEADER_STDC +PKG_PROG_PKG_CONFIG AC_PROG_MAKE_SET AC_PROG_INSTALL AC_PROG_RANLIB AC_PROG_GPERF -PKG_PROG_PKG_CONFIG AC_CHECK_TOOL(AR, ar, ar) AC_SYS_LARGEFILE @@ -71,16 +56,12 @@ 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' - dnl ---------------- gpgme ---------------- AC_ARG_ENABLE(gpgme, AC_HELP_STRING([--enable-gpgme], [Enable GPGME support]),[ @@ -94,18 +75,8 @@ AC_ARG_ENABLE(gpgme, AC_HELP_STRING([--enable-gpgme], [Enable GPGME support]),[ fi ]) -dnl ---------------- mixmaster ---------------- - -AC_ARG_WITH(mixmaster, AC_HELP_STRING([--with-mixmaster[=PATH]], [Include Mixmaster support]), [ - MIXMASTER=${withval:-"mixmaster"} - 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_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 @@ -135,8 +106,8 @@ main () 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" + 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 @@ -242,13 +213,8 @@ else fi AC_DECL_SYS_SIGLIST - AC_TYPE_PID_T -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) @@ -274,7 +240,6 @@ if test x$with_homespool != x; then 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 else AC_ARG_WITH(mailpath, AC_HELP_STRING([--with-mailpath=DIR], [Directory where spool mailboxes are located]), @@ -309,9 +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 @@ -325,7 +288,6 @@ int main (int argc, char **argv) }], 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 @@ -363,8 +325,6 @@ AC_ARG_ENABLE(nntp, AC_HELP_STRING([--enable-nntp],[Enable NNTP support]),[ ]) AM_CONDITIONAL(BUILD_NNTP, test x$need_nntp = xyes) -dnl -- end socket dependencies -- - AC_MSG_CHECKING([for socklen_t]) AC_EGREP_HEADER(socklen_t, sys/socket.h, AC_MSG_RESULT([yes]), AC_MSG_RESULT([no]) @@ -375,30 +335,18 @@ 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 - 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" -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 @@ -459,7 +407,7 @@ AC_ARG_WITH(sasl2, AC_HELP_STRING([--with-sasl2[=PFX]], ]) 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]),[ +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 @@ -473,12 +421,6 @@ AC_ARG_WITH(idn, AC_HELP_STRING([--with-idn=[PFX]], [Use GNU libidn for domain n 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. ]) @@ -501,11 +443,6 @@ if test x$ac_cv_dirent_d_ino = xyes ; then fi AC_MSG_RESULT($ac_cv_dirent_d_ino) -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]) - dnl -- start cache -- AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching]), [if test x$enableval = xyes; then @@ -528,7 +465,7 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching]) ac_prefer_gdbm=$withval) 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 @@ -550,7 +487,7 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching]) 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_qdbm_here != xyes; then - test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr" + 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 @@ -628,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) @@ -641,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() { @@ -663,85 +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_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_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 -- @@ -750,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 -- @@ -762,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*) @@ -813,25 +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 - lib-lib/Makefile - lib-mime/Makefile - lib-crypt/Makefile - lib-hash/Makefile - lib-sys/Makefile - lib-ui/Makefile - lib/Makefile - imap/Makefile - pop/Makefile - nntp/Makefile - Madmuttrc.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 +)