X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=configure.ac;h=bd9bd84a1a210c51231bb3aa62dc4f4c745a9ba3;hb=4956024f0d540c5dd689444113307fa7f9dd4067;hp=42d180601911a38b1a421fb1e2886189792d1db2;hpb=4679714d372c301752dd4b26f4e3fa45641be4b9;p=apps%2Fmadmutt.git

diff --git a/configure.ac b/configure.ac
index 42d1806..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 <sys/param.h>
@@ -135,7 +136,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 +179,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"
     ])
@@ -642,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
@@ -743,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