X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fconfigure.ac;h=f17cc58195f42e728c41e9680846e0a04e80d863;hb=ebc64e2caae8740dd047e5317de2172eb3f44fc3;hp=6485534c22b52660a03682254c93134702b188a4;hpb=c82a9b990b775ffd78b18925dbc00c7bb06e0a24;p=citadel.git

diff --git a/webcit/configure.ac b/webcit/configure.ac
index 6485534c2..f17cc5819 100644
--- 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)
@@ -137,7 +137,7 @@ dnl AC_FUNC_VPRINTF
 AC_REPLACE_FUNCS(snprintf)
 AC_CHECK_HEADER(CUnit/CUnit.h, [AC_DEFINE(ENABLE_TESTS, [], [whether we should compile the test-suite])])
 
-AC_CHECK_HEADERS(fcntl.h limits.h sys/time.h unistd.h iconv.h xlocale.h)
+AC_CHECK_HEADERS(fcntl.h limits.h unistd.h iconv.h xlocale.h)
 
 dnl Checks for the zlib compression library.
 saved_CFLAGS="$CFLAGS"
@@ -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