LDAP: check for new values in LDAP on each login (by HarryC)

[citadel.git] / webcit / configure.ac

diff --git a/webcit/configure.ac b/webcit/configure.ac
index 4f4ad598e8161ea309050ab6ec391e8ec5e334e6..1bdca0631d3788b7d87216ec10e77ca3e92e0500 100644 (file)
--- a/webcit/configure.ac
+++ b/webcit/configure.ac
@@ -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,6 +493,7 @@ if test "$prefix" = NONE; then
        wwwdir=$ac_default_prefix
        rundir=$ac_default_prefix
        editordir=$ac_default_prefix/tiny_mce
+       markdowneditordir=$ac_default_prefix/epic
        etcdir=$ac_default_prefix
 else
        localedir=$prefix
@@ -493,6 +501,7 @@ else
        datadir=$prefix
        rundir=$prefix
        editordir=$prefix/tiny_mce
+       markdowneditordir=$prefix/epic
        etcdir=$prefix
 fi
 
@@ -554,6 +563,15 @@ AC_ARG_WITH(editordir,
 )
 AC_DEFINE_UNQUOTED(EDITORDIR, "$editordir", [where to find our mail editor])
 
+AC_ARG_WITH(markdowneditordir, 
+                   [  --with-markdowneditordir             directory to put our markdown editor],
+                       [ if test "x$withval" != "xno" ; then
+                               markdowneditordir=$withval
+                         fi
+                       ]
+)
+AC_DEFINE_UNQUOTED(MARKDOWNEDITORDIR, "$markdowneditordir", [where to find our markdown editor])
+
 dnl Checks where to find our configs
 AC_ARG_WITH(etcdir, 
                    [  --with-etcdir             directory to read our configs],
@@ -577,6 +595,7 @@ AC_OUTPUT(Makefile po/webcit/Makefile tests/Makefile)
 if test "$abs_srcdir" != "$abs_builddir"; then
    ln -s $abs_srcdir/static $abs_builddir
    ln -s $abs_srcdir/tiny_mce $abs_builddir
+   ln -s $abs_srcdir/epic $abs_builddir
    ln -s $abs_srcdir/*.h $abs_builddir
    make mkdir-init