X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fconfigure.ac;h=8cc9c27f3c15ff24bdace33806d59cf7bf2e0f53;hb=37cdd9932e7854c7bde2b83a0b4f5f6aad105306;hp=96af2d2bc340601d756f66b9bc60639deab36eb6;hpb=068041fff9d6627b6699c6af817fb09f11c23cc5;p=citadel.git diff --git a/webcit/configure.ac b/webcit/configure.ac index 96af2d2bc..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], [7.44], [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,34 @@ 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, + [AC_TRY_COMPILE([#include +#include ], + [ + struct passwd pw, *pwp; + char pwbuf[64]; + uid_t uid; + + getpwuid_r(uid, &pw, pwbuf, sizeof(pwbuf), &pwp); + ], + ac_cv_call_getpwuid_r=yes, + ac_cv_call_getpwuid_r=no) + ]) + +if test $ac_cv_call_getpwuid_r = no; then + AC_DEFINE(SOLARIS_GETPWUID,[],[do we need to use solaris call syntax?]) + AC_DEFINE(SOLARIS_LOCALTIME_R,[], [do we need to use soralis call syntax?]) + AC_DEFINE(F_UID_T, "%ld", [whats the matching format string for uid_t?]) + AC_DEFINE(F_PID_T, "%ld", [whats the matching format string for pid_t?]) + AC_DEFINE(F_XPID_T, "%lx", [whats the matching format string for xpid_t?]) +else + AC_DEFINE(F_UID_T, "%d", [whats the matching format string for uid_t?]) + AC_DEFINE(F_PID_T, "%d", [whats the matching format string for pid_t?]) + AC_DEFINE(F_XPID_T, "%x", [whats the matching format string for xpid_t?]) +fi @@ -95,26 +122,41 @@ dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_TYPE_OFF_T AC_TYPE_SIZE_T +dnl Check the size of various builtin types; see typesize.h (error) +AC_CHECK_SIZEOF(char, 0) +AC_CHECK_SIZEOF(short, 0) +AC_CHECK_SIZEOF(int, 0) +AC_CHECK_SIZEOF(long, 0) +AC_CHECK_SIZEOF(long unsigned int, 0) +AC_CHECK_SIZEOF(size_t, 0) dnl AC_HEADER_TIME dnl Checks for library functions. AC_TYPE_SIGNAL dnl AC_FUNC_VPRINTF AC_REPLACE_FUNCS(snprintf) -AC_CHECK_HEADERS(fcntl.h limits.h sys/time.h unistd.h iconv.h xlocale.h) +AC_CHECK_HEADER(CUnit/CUnit.h, [AC_DEFINE(ENABLE_TESTS, [], [whether we should compile the test-suite])]) -dnl Checks for the zlib compression library. -if test "x$with_zlib" != xno ; then - AC_CHECK_HEADERS(zlib.h, - [AC_CHECK_LIB(z, zlibVersion, - [ok_zlib=yes],, - )]) -fi +AC_CHECK_HEADERS(fcntl.h limits.h unistd.h iconv.h xlocale.h) -if test "x$ok_zlib" = xyes ; then -dnl libcitadel will bring libz, so we don't need it here. LDFLAGS="-lz $LDFLAGS" - AC_DEFINE(HAVE_ZLIB, [], [define this if you have zlib compression available]) -fi +dnl Checks for the zlib compression library. +saved_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS $SERVER_LIBS" +AC_CHECK_HEADER(zlib.h, + [AC_CHECK_LIB(z, zlibVersion, + [ + LIBS="-lz $LIBS $SERVER_LIBS" + ], + [ + AC_MSG_ERROR(zlib was not found or is not usable. Please install zlib.) + ] + , + )], + [ + AC_MSG_ERROR(zlib.h was not found or is not usable. Please install zlib.) + ] +) +CFLAGS="$saved_CFLAGS" dnl Here is the check for a libc integrated iconv AC_ARG_ENABLE(iconv, @@ -166,10 +208,10 @@ if test "$ok_iconv" = no; then ) fi if test "$ok_iconv" != "no"; then - AC_MSG_RESULT(WebCit will be built with character set conversion.) + AC_MSG_RESULT(webcit will be built with character set conversion.) AC_DEFINE(HAVE_ICONV,[],[whether we have iconv for charset conversion]) else - AC_MSG_RESULT(WebCit will be built without character set conversion.) + AC_MSG_RESULT(webcit will be built without character set conversion.) fi AC_CHECK_LIB(intl, libintl_bindtextdomain, [LDFLAGS="$LDFLAGS -lintl"]) @@ -191,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, @@ -209,6 +258,52 @@ 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, + [AC_CHECK_LIB(expat, XML_ParserCreateNS, + [ + LIBS="-lexpat $LIBS" + ], + [ + AC_MSG_ERROR(The Expat XML parser was not found and is required. More info: http://www.citadel.org/doku.php/installation:start) + ] + , + )], + [ + AC_MSG_ERROR(expat.h was not found and is required. More info: http://www.citadel.org/doku.php/installation:start) + ] +) + found_ssl=no @@ -363,7 +458,7 @@ fi if test "$ok_nls" != "no"; then AC_MSG_RESULT(WebCit will be built with national language support.) AC_DEFINE(ENABLE_NLS, [], [whether we have NLS support]) - PROG_SUBDIRS="$PROG_SUBDIRS po" + PROG_SUBDIRS="$PROG_SUBDIRS po/webcit/" else AC_MSG_RESULT(WebCit will be built without national language support.) fi @@ -397,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 @@ -461,14 +560,47 @@ AC_ARG_WITH(editordir, fi ] ) -AC_DEFINE_UNQUOTED(EDITORDIR, "$editordir", [where to find our mail editor]) -./mk_module_init.sh +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 + CFLAGS="$CFLAGS -I $abs_builddir" +fi AC_CONFIG_HEADER(sysdep.h) -AC_OUTPUT(Makefile po/Makefile ) +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 + +else +dnl just run it on devel systems and if non vdir build. + if test -d .svn; then + ./mk_module_init.sh + fi +fi + +if test -n "$srcdir"; then + export srcdir=. +fi + echo ------------------------------------------------------------------------ echo 'Character set conversion support:' $ok_iconv echo 'National language support: ' $ok_nls -echo 'Compression support: ' $ok_zlib echo