X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.ac;h=1187006b123ecdc953e61dbec7828af7ad5473ab;hp=ce8e3ae76a911f50879a4b364392d72d5e111b07;hb=2d0afa54b647f32caa7a4bf3917e50f5d3e8c1e2;hpb=5b365d691700e8e59f96dfa3a4c209574da29898

diff --git a/configure.ac b/configure.ac
index ce8e3ae..1187006 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,8 +62,6 @@ 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]),[
@@ -77,16 +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.])
-])
-
-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
@@ -145,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
 
@@ -189,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"
     ])
@@ -716,18 +705,48 @@ 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
+          tools/Makefile
           lib-lib/Makefile
           lib-mime/Makefile
           lib-crypt/Makefile
           lib-hash/Makefile
+          lib-mx/Makefile
           lib-sys/Makefile
           lib-ui/Makefile
           imap/Makefile