X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.ac;h=a461d13de9ae207c7c1a586d12f78544037b1063;hp=0685e443e049510a014e76a5163b9f30f15a00df;hb=0c73c9a8dd4f023a9d2cce2e72904e8bbc9ade3e;hpb=1d0ce70b85c36973b50e5783fe7b72941c81c0a9

diff --git a/configure.ac b/configure.ac
index 0685e44..a461d13 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 ---------------- 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 +75,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 <sys/param.h>
@@ -135,7 +135,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 +178,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 +641,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
@@ -706,17 +706,44 @@ else
 fi
 AC_SUBST(HTMLCLEAN_CMD)
 
+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-lua/Makefile
           lib-mime/Makefile
-          lib-crypt/Makefile
           lib-hash/Makefile
           lib-mx/Makefile
           lib-sys/Makefile