Use p_new instead of xmalloc()

[apps/madmutt.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7bc00b3..42d1806 100644 (file)
--- 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 \$(srcdir)/OPS.PGP \$(srcdir)/OPS.SMIME \$(srcdir)/OPS.CRYPT"
-
 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
@@ -250,7 +240,6 @@ if test x$with_homespool != x; then
         relative the the home directory.
         use: configure --with-homespool=FILE
     ])
-    AC_DEFINE(USE_DOTLOCK,1,[ Define to use dotlocking for mailboxes. ])
     mutt_cv_setgid=no
 else
     AC_ARG_WITH(mailpath, AC_HELP_STRING([--with-mailpath=DIR], [Directory where spool mailboxes are located]),
@@ -285,9 +274,7 @@ int main (int argc, char **argv)
 }], mutt_cv_worldwrite=yes, mutt_cv_worldwrite=no, mutt_cv_worldwrite=no)])
 
         mutt_cv_setgid=no
-        if test $mutt_cv_worldwrite = yes; then
-                AC_DEFINE(USE_DOTLOCK,1,[ Define to use dotlocking for mailboxes. ])
-        else
+        if test $mutt_cv_worldwrite != yes; then
                 AC_CACHE_CHECK(if $mutt_cv_mailpath is group writable, mutt_cv_groupwrite, [AC_TRY_RUN([#include <sys/types.h>
 #include <sys/stat.h>
 
@@ -301,7 +288,6 @@ int main (int argc, char **argv)
 }], mutt_cv_groupwrite=yes, mutt_cv_groupwrite=no, mutt_cv_groupwrite=no)])
 
         if test $mutt_cv_groupwrite = yes; then
-            AC_DEFINE(USE_DOTLOCK,1,[ Define to use dotlocking for mailboxes. ])
             AC_DEFINE(USE_SETGID,1,[ Define if mutt should run setgid "mail". ])
             mutt_cv_setgid=yes
         fi
@@ -355,13 +341,10 @@ AC_ARG_WITH(gss, AC_HELP_STRING([--with-gss], [Compile in GSSAPI authentication
             CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS"
             MUTTLIBS="$MUTTLIBS $GSSAPI_LIBS"
             AC_DEFINE(USE_GSS,1,[ Define if you have GSSAPI libraries available ])
-            AM_CONDITIONAL(USE_GSS, true)
+            AC_CHECK_HEADERS(xom.h)
         ],[
-           AC_MSG_RESULT([could not find libgssapi])
-           AM_CONDITIONAL(USE_GSS, false)
+           AC_MSG_ERROR([could not find libgssapi])
         ])
-    else
-       AM_CONDITIONAL(USE_GSS, false)
     fi
 ])
 
@@ -460,11 +443,6 @@ if test x$ac_cv_dirent_d_ino = xyes ; then
 fi
 AC_MSG_RESULT($ac_cv_dirent_d_ino)
 
-AC_ARG_ENABLE(buffy-size, AC_HELP_STRING([--enable-buffy-size], [Use file size attribute instead of access time]),
-        [if test x$enableval = xyes; then
-                AC_DEFINE(BUFFY_SIZE,1,[ Define to enable the "buffy_size" feature. ])
-        fi])
-
 dnl -- start cache --
 AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching]),
 [if test x$enableval = xyes; then
@@ -634,9 +612,7 @@ fi # libiconv
 
 dnl -- locales --
 
-AC_CHECK_HEADERS(locale.h)
-AC_CHECK_HEADERS(wchar.h)
-AC_CHECK_HEADERS(wctype.h)
+AC_CHECK_HEADERS(locale.h wchar.h wctype.h)
 AC_CHECK_FUNCS(iswalnum iswalpha  iswcntrl iswdigit)
 AC_CHECK_FUNCS(iswgraph iswlower iswprint iswpunct iswspace iswupper)
 AC_CHECK_FUNCS(iswxdigit towupper towlower)
@@ -730,21 +706,49 @@ 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-mime/Makefile
           lib-crypt/Makefile
           lib-hash/Makefile
+          lib-mx/Makefile
           lib-sys/Makefile
           lib-ui/Makefile
-          lib/Makefile
           imap/Makefile
           pop/Makefile
           nntp/Makefile