X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.ac;h=8fd5613f6cf24f45f985a4f672cab68a33910003;hp=42d180601911a38b1a421fb1e2886189792d1db2;hb=8e689b28eefc1a93797f299c33f7ec3e2e340329;hpb=4679714d372c301752dd4b26f4e3fa45641be4b9 diff --git a/configure.ac b/configure.ac index 42d1806..8fd5613 100644 --- a/configure.ac +++ b/configure.ac @@ -6,9 +6,7 @@ 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"`) - -AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION.in']) +AM_INIT_AUTOMAKE(madmutt, devel) AC_GNU_SOURCE @@ -62,6 +60,12 @@ 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. ]) +dnl ---------------- lua5.1 ---------------- +PKG_CHECK_MODULES(LUA,lua5.1,[ + CPPFLAGS="$CPPFLAGS $LUA_CFLAGS" + LDFLAGS="$LDFLAGS $LUA_LIBS" +],[AC_MSG_ERROR([could not find lua5.1])]) + dnl ---------------- gpgme ---------------- AC_ARG_ENABLE(gpgme, AC_HELP_STRING([--enable-gpgme], [Enable GPGME support]),[ @@ -69,20 +73,14 @@ AC_ARG_ENABLE(gpgme, AC_HELP_STRING([--enable-gpgme], [Enable GPGME support]),[ 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) + AC_MSG_ERROR([could not find gpgme]) fi ]) 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.]) -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 @@ -135,7 +133,6 @@ 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(HAVE_COLOR,1,[ Define if your curses library supports color. ]) dnl --- now that we've found it, check the link @@ -179,8 +176,8 @@ main () 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. ]) + if test "$ac_cv_func_decl_start_color" != yes; then + AC_MSG_ERROR([Your curses library does not supports color.]) fi LIBS="$old_LIBS" ]) @@ -335,19 +332,6 @@ AC_CHECK_FUNCS(getaddrinfo) dnl -- imap dependencies -- -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 -]) - 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 "$with_ssl" != "yes"; then @@ -385,27 +369,8 @@ 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"; then - if test "$with_sasl2" != "yes"; then - CPPFLAGS="$CPPFLAGS -I$with_sasl2/include" - LDFLAGS="$LDFLAGS -L$with_sasl2/lib" - fi - - saved_LIBS="$LIBS" - - 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 -]) -AM_CONDITIONAL(USE_SASL, test x$need_sasl = xyes) +AC_CHECK_LIB(sasl2, sasl_client_init,,AC_MSG_ERROR([could not find libsasl2])) +MUTTLIBS="$MUTTLIBS -lsasl2" AC_ARG_WITH(idn, AC_HELP_STRING([--with-idn], [Use GNU libidn for domain names]),[ if test x$with_idn != xno ; then @@ -415,6 +380,7 @@ AC_ARG_WITH(idn, AC_HELP_STRING([--with-idn], [Use GNU libidn for domain names]) fi CPPFLAGS="$CPPFLAGS $IDN_CFLAGS" LDFLAGS="$LDFLAGS $IDN_LIBS" + AC_DEFINE(HAVE_LIBIDN, 1, [IDN Support]) ],[AC_MSG_ERROR([could not find libidn])]) fi ]) @@ -551,7 +517,6 @@ fi]) dnl -- end cache -- AC_SUBST(MUTTLIBS) -AC_SUBST(MUTT_LIB_OBJECTS) AC_SUBST(LIBNNTP) AC_SUBST(LIBNNTPDEPS) @@ -642,8 +607,8 @@ dnl -- libesmtp -- MUTT_AM_LIBESMTP 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" + dnl HACK MUTTLIBS="$MUTTLIBS $mutt_libesmtp_libs" + MUTTLIBS="$MUTTLIBS -lesmtp" AC_DEFINE(USE_LIBESMTP, 1, [Define to enable the use of libesmtp]) fi dnl -- end libesmtp -- @@ -735,16 +700,13 @@ 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-lua/Makefile lib-mime/Makefile - lib-crypt/Makefile lib-hash/Makefile lib-mx/Makefile lib-sys/Makefile