Markdown: if we find libmarkdown, register a renderer for text/x-markdown

[citadel.git] / webcit / configure.ac

diff --git a/webcit/configure.ac b/webcit/configure.ac
index 46d6b51c107c4cd86c7ebdcc43ef452b4a02c70b..6e67b56c4305bada850172734420115d5e79cd2a 100644 (file)
--- a/webcit/configure.ac
+++ b/webcit/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl $Id$
-AC_INIT([WebCit], [8.20], [http://www.citadel.org/])
+AC_INIT([WebCit], [8.29], [http://www.citadel.org/])
 
 
 AC_SUBST(PROG_SUBDIRS)
@@ -234,6 +234,13 @@ AC_CHECK_HEADER(libical/ical.h,
        ]
 )
 
+dnl Checks for the discount markdown library.
+AC_CHECK_LIB(markdown,
+        markdown,
+        [
+        LDFLAGS="$LDFLAGS -lmarkdown"
+        AC_DEFINE(HAVE_MARKDOWN,[],[whether we have markdown message rendering])
+])
 
 dnl Check for libcitadel
 AC_CHECK_HEADER(libcitadel.h,
@@ -486,12 +493,14 @@ if test "$prefix" = NONE; then
        wwwdir=$ac_default_prefix
        rundir=$ac_default_prefix
        editordir=$ac_default_prefix/tiny_mce
+       etcdir=$ac_default_prefix
 else
        localedir=$prefix
        wwwdir=$prefix
        datadir=$prefix
        rundir=$prefix
        editordir=$prefix/tiny_mce
+       etcdir=$prefix
 fi
 
 dnl where to put the locale files
@@ -552,6 +561,18 @@ AC_ARG_WITH(editordir,
 )
 AC_DEFINE_UNQUOTED(EDITORDIR, "$editordir", [where to find our mail editor])
 
+dnl Checks where to find our configs
+AC_ARG_WITH(etcdir, 
+                   [  --with-etcdir             directory to read our configs],
+                       [ if test "x$withval" != "xno" ; then
+                               etcdir=$withval
+                         fi
+                       ]
+)
+AC_DEFINE_UNQUOTED(ETCDIR, "$etcdir", [where to find our configs])
+ETCDIR=$etcdir
+AC_SUBST(ETCDIR)
+
 abs_srcdir="`cd $srcdir && pwd`"
 abs_builddir="`pwd`"
 if test "$abs_srcdir" != "$abs_builddir"; then