X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fconfigure.ac;h=8cc9c27f3c15ff24bdace33806d59cf7bf2e0f53;hb=37cdd9932e7854c7bde2b83a0b4f5f6aad105306;hp=ba0d46d31d1a404be8e95ab624f9dd70f2677a97;hpb=87adb75f05be524428f1563ab28a60b1795f4612;p=citadel.git diff --git a/webcit/configure.ac b/webcit/configure.ac index ba0d46d31..8cc9c27f3 100644 --- a/webcit/configure.ac +++ b/webcit/configure.ac @@ -1,7 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl $Id$ -AC_INIT([WebCit], [8.03], [http://www.citadel.org/]) - +AC_INIT([WebCit],m4_esyscmd_s([grep CLIENT_VERSION webcit.h | sed 's/[^0-9]*//g']),[http://uncensored.citadel.org]) AC_SUBST(PROG_SUBDIRS) AC_DEFINE(PROG_SUBDIRS, [], [Program dirs]) @@ -88,6 +87,7 @@ dnl Checks for header files. AC_HEADER_STDC dnl AC_HEADER_SYS_WAIT +AC_CHECK_FUNCS(crypt gethostbyname connect flock getpwnam_r getpwuid_r getloadavg) AC_CACHE_CHECK( [for call semantics from getpwuid_r], ac_cv_call_getpwuid_r, @@ -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" @@ -214,7 +214,6 @@ else AC_MSG_RESULT(webcit will be built without character set conversion.) fi - AC_CHECK_LIB(intl, libintl_bindtextdomain, [LDFLAGS="$LDFLAGS -lintl"]) @@ -234,6 +233,13 @@ AC_CHECK_HEADER(libical/ical.h, ] ) +dnl Checks for the discount markdown library. +AC_CHECK_LIB(markdown, + markdown, + [ + LIBS="$LIBS -lmarkdown" + AC_DEFINE(HAVE_MARKDOWN,[],[whether we have markdown message rendering]) +]) dnl Check for libcitadel AC_CHECK_HEADER(libcitadel.h, @@ -252,6 +258,35 @@ AC_CHECK_HEADER(libcitadel.h, ] ) +AC_MSG_CHECKING([whether your system likes memcpy + HKEY]) +AC_TRY_COMPILE([ +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "lib/libcitadel.h" +], +[ + char foo[22]; + memcpy(foo, HKEY("foo")); + +], + [ + + AC_MSG_RESULT([yes]) + ], + [ + AC_DEFINE(UNDEF_MEMCPY, [], [whether we need to undefine memcpy]) + AC_MSG_RESULT([no]) + ] +) dnl Checks for the Expat XML parser. AC_CHECK_HEADER(expat.h, @@ -457,12 +492,16 @@ 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 wwwdir=$prefix datadir=$prefix rundir=$prefix editordir=$prefix/tiny_mce + markdowneditordir=$prefix/epic + etcdir=$prefix fi dnl where to put the locale files @@ -521,7 +560,18 @@ AC_ARG_WITH(editordir, fi ] ) -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`" @@ -534,6 +584,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