X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=configure.ac;h=bd9bd84a1a210c51231bb3aa62dc4f4c745a9ba3;hb=4fb2fb9b1c03ad9ffd59ff86f7eaa697e46ef49d;hp=91622711e2085f67a55523e51685dcec4307726b;hpb=486de69aa30a7bfca3625a1b521411dc7a15c55c;p=apps%2Fmadmutt.git diff --git a/configure.ac b/configure.ac index 9162271..bd9bd84 100644 --- a/configure.ac +++ b/configure.ac @@ -62,6 +62,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 ---------------- gpgme ---------------- +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]),[ @@ -78,11 +84,6 @@ AC_ARG_ENABLE(gpgme, AC_HELP_STRING([--enable-gpgme], [Enable GPGME support]),[ 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 @@ -641,7 +642,8 @@ dnl -- libesmtp -- MUTT_AM_LIBESMTP if test x$use_libesmtp = xyes; then CFLAGS="$CFLAGS $mutt_libesmtp_cflags" - MUTTLIBS="$MUTTLIBS $mutt_libesmtp_libs" + dnl HACK MUTTLIBS="$MUTTLIBS $mutt_libesmtp_libs" + MUTTLIBS="$MUTTLIBS -lesmtp" MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_libesmtp.o" AC_DEFINE(USE_LIBESMTP, 1, [Define to enable the use of libesmtp]) fi @@ -742,6 +744,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/instdoc.sh contrib/Makefile lib-lib/Makefile + lib-lua/Makefile lib-mime/Makefile lib-crypt/Makefile lib-hash/Makefile