X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Fconfigure.ac;h=6f3a7bc775ebfd4a6901e17da0984ff2a96a86c4;hp=d8c30e82d586008e26d8b4aab3a8a9ece4e5bc70;hb=faa7bc4175fa88b5fd6548b2e92cdc5497dfe692;hpb=1e656d277fe91b7c4f5d73eab4a0dd0b7a173145 diff --git a/webcit/configure.ac b/webcit/configure.ac index d8c30e82d..6f3a7bc77 100644 --- a/webcit/configure.ac +++ b/webcit/configure.ac @@ -1,6 +1,7 @@ dnl Process this file with autoconf to produce a configure script. dnl $Id$ -AC_INIT([WebCit], [7.24], [http://www.citadel.org/]) +AC_INIT([WebCit], [8.10], [http://www.citadel.org/]) + AC_SUBST(PROG_SUBDIRS) AC_DEFINE(PROG_SUBDIRS, [], [Program dirs]) @@ -23,8 +24,6 @@ else ssl_dir="$prefix/keys" fi -AC_ARG_WITH(with_libical, [ --with-libical use libical calendaring library]) -AC_ARG_WITH(with_zlib, [ --with-zlib use zlib compression if present]) AC_ARG_WITH(ssl, [ --with-ssl=PATH Specify path to OpenSSL installation ], [ @@ -52,6 +51,8 @@ case "$host" in *-*-solaris*) PTHREAD_DEFS='-D_REENTRANT -D_PTHREADS' ;; + *-*-darwin*) + LIBS=-lintl esac AC_SUBST(PTHREAD_DEFS) @@ -62,9 +63,11 @@ dnl Configure compiler flags for GCC if test "$GCC" = yes; then case "$host" in *-*-solaris*) +dnl CFLAGS="$CFLAGS -Wall -Wno-char-subscripts --pedantic" CFLAGS="$CFLAGS -Wall -Wno-char-subscripts" ;; *) +dnl CFLAGS="$CFLAGS -Wall --pedantic" CFLAGS="$CFLAGS -Wall" ;; esac @@ -84,8 +87,34 @@ AC_SEARCH_LIBS(connect, socket) dnl Checks for header files. AC_HEADER_STDC dnl AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS(fcntl.h limits.h sys/time.h unistd.h) +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 @@ -93,20 +122,125 @@ 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_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) + +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, + [ --disable-iconv do not use iconv charset conversion], + ok_iconv=no, ok_iconv=yes) + +AC_MSG_CHECKING(Checking to see if your system supports iconv) +AC_TRY_RUN([ + #include + main() { + iconv_t ic = (iconv_t)(-1) ; + ic = iconv_open("UTF-8", "us-ascii"); + iconv_close(ic); + exit(0); + } + ], + [ + ok_iconv=yes + AC_MSG_RESULT([yes]) + ], + [ + ok_iconv=no + AC_MSG_RESULT([no]) + ] +) + +dnl Check for iconv in external libiconv +if test "$ok_iconv" = no; then + AC_MSG_CHECKING(Checking for an external libiconv) + OLD_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -liconv" + AC_TRY_RUN([ + #include + main() { + iconv_t ic = (iconv_t)(-1) ; + ic = iconv_open("UTF-8", "us-ascii"); + iconv_close(ic); + } + ], + [ + ok_iconv=yes + AC_MSG_RESULT([yes]) + ], + [ + ok_iconv=no + LDFLAGS="$OLD_LDFLAGS" + AC_MSG_RESULT([no]) + ] + ) +fi +if test "$ok_iconv" != "no"; then + 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.) +fi + + +AC_CHECK_LIB(intl, libintl_bindtextdomain, [LDFLAGS="$LDFLAGS -lintl"]) + + +dnl Checks for the libical iCalendar library. +AC_CHECK_HEADER(libical/ical.h, + [AC_CHECK_LIB(ical, icaltimezone_set_tzid_prefix, + [ + LIBS="-lical $LIBS" + ], + [ + AC_MSG_ERROR(libical was not found and is required. More info: http://www.citadel.org/doku.php/installation:start) + ] + , + )], + [ + AC_MSG_ERROR(libical/ical.h was not found and is required. More info: http://www.citadel.org/doku.php/installation:start) + ] +) dnl Check for libcitadel AC_CHECK_HEADER(libcitadel.h, [AC_CHECK_LIB(citadel, libcitadel_version_string, [ - AC_MSG_RESULT(OK) LIBS="-lcitadel $LIBS" + SETUP_LIBS="-lcitadel $SETUP_LIBS" ], [ AC_MSG_ERROR(libcitadel was not found or is not usable. Please install libcitadel.) @@ -119,60 +253,25 @@ AC_CHECK_HEADER(libcitadel.h, ) -webcit_with_calendar_service=no -dnl Checks for the libical calendaring library. -if test "x$with_libical" != xno ; then - AC_CHECK_HEADERS(ical.h, - [AC_CHECK_LIB(ical, icalcomponent_new, - [ok_libical=yes],, - )]) -fi - -if test "x$ok_libical" = xyes ; then - - AC_TRY_RUN( +dnl Checks for the Expat XML parser. +AC_CHECK_HEADER(expat.h, + [AC_CHECK_LIB(expat, XML_ParserCreateNS, [ -#include -main() { - int major, minor, v; - sscanf(ICAL_VERSION, "%d.%d", &major, &minor); - v = 100*major + minor; - printf("libical version: %i\n", v); - if (v >= 24) { - printf("This version is ok.\n"); - return(0); - } - printf("libical 0.24 or newer required.\n"); - printf("Citadel will be built without calendar support.\n"); - return(1); -} - ], + LIBS="-lexpat $LIBS" + ], [ - LIBS="-lical $LIBS" - AC_DEFINE(HAVE_LIBICAL,[],[whether we have libical available]) - webcit_with_calendar_service=yes + AC_MSG_ERROR(The Expat XML parser was not found and is required. More info: http://www.citadel.org/doku.php/installation:start) ] - ) -fi - -if test "$webcit_with_calendar_service" == "yes"; then - AC_DEFINE(WEBCIT_WITH_CALENDAR_SERVICE,[],[whether we can do with calendar.]) -fi - -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_MSG_ERROR(expat.h was not found and is required. More info: http://www.citadel.org/doku.php/installation:start) + ] +) -if test "x$ok_zlib" = xyes ; then - LIBS="-lz $LIBS" - AC_DEFINE(HAVE_ZLIB,[],[whether we have zlib]) -fi +found_ssl=no # The big search for OpenSSL if test "$with_ssl" != "no"; then saved_LIBS="$LIBS" @@ -255,6 +354,7 @@ if test "$with_ssl" != "no"; then if test "x$ac_cv_openssldir" != "xno" ; then AC_DEFINE(HAVE_OPENSSL,[],[whethe we have openssl]) + found_ssl=yes LIBS="-lssl -lcrypto $LIBS" dnl Need to recover ssldir - test above runs in subshell ssldir=$ac_cv_openssldir @@ -290,73 +390,20 @@ AC_ARG_WITH(ssldir, [ if test "x$withval" != "xno" ; then ssl_dir="$withval" + if test "$found_ssl" = "no"; then + echo "Your setup was incomplete; ssldir doesn't make sense without openssl" + exit + fi fi AC_SUBST(MAKE_SSL_DIR) ] ) AC_DEFINE_UNQUOTED(SSL_DIR, "$ssl_dir", [were should we put our keys?]) -dnl Here is the check for a usable iconv - -AC_ARG_ENABLE(iconv, - [ --disable-iconv do not use iconv charset conversion], - ok_iconv=no, ok_iconv=yes) - -if test "$ok_nls" != "no"; then - AC_MSG_RESULT(Checking to see if your system supports iconv...) - AC_TRY_RUN([ - #include - main() { - iconv_t ic = (iconv_t)(-1) ; - ic = iconv_open("UTF-8", "us-ascii"); - iconv_close(ic); - exit(0); - } - ], - ok_iconv=yes, - ok_iconv=no - ) -fi - -if test "$ok_iconv" != "no"; then - 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.) -fi - -dnl Here is the check for libintl etc. -AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - ok_nls=no, ok_nls=yes) - -if test "$ok_nls" != "no"; then - AC_MSG_RESULT(Checking for per-thread NLS support...) - AC_TRY_RUN([ - #define _GNU_SOURCE - #include - #include - #include - main() { - char *foo = NULL; - char baz[32]; - struct tm *tm; - uselocale(LC_GLOBAL_LOCALE); - foo = gettext("bar"); - if (0) { - strftime_l(baz, sizeof baz, "%c", tm, LC_GLOBAL_LOCALE); - } - exit(0); - } - ], - ok_uselocale=yes, - ok_uselocale=no - ) - ok_nls=$ok_uselocale -fi +AC_CHECK_FUNCS(strftime_l uselocale gettext) if test "$ok_nls" != "no"; then AC_CHECK_PROG(ok_xgettext, xgettext, yes, no) @@ -376,7 +423,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 @@ -476,12 +523,33 @@ AC_ARG_WITH(editordir, ) AC_DEFINE_UNQUOTED(EDITORDIR, "$editordir", [where to find our mail editor]) +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/*.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 'zlib compression: ' $ok_zlib -echo 'Calendar support: ' $ok_libical echo 'Character set conversion support:' $ok_iconv echo 'National language support: ' $ok_nls echo