dnl Process this file with autoconf to produce a configure script.
dnl $Id$
AC_PREREQ(2.52)
-AC_INIT([Citadel], [7.35], [http://www.citadel.org/])
+AC_INIT([Citadel], [7.38], [http://www.citadel.org/])
AC_REVISION([$Revision: 5108 $])
AC_CONFIG_SRCDIR([citserver.c])
AC_PREFIX_DEFAULT(/usr/local/citadel)
]
)
-dnl Checks for the Datadir
+
+dnl Checks for the helpDatadir
+AC_ARG_WITH(helpdir,
+ [ --with-helpdir directory to store the helpfiles under],
+ [ if test "x$withval" != "xno" ; then
+ AC_DEFINE(HAVE_HELP_DIR,[],[use alternate database location?])
+ AC_DEFINE_UNQUOTED(HELP_DIR, "$withval",[define, if the user suplied a helpfile-directory to use.])
+ MAKE_HELP_DIR=$withval
+ AC_SUBST(MAKE_HELP_DIR)
+ fi
+ ]
+)
+
+dnl Checks for the Static Datadir
AC_ARG_WITH(staticdatadir,
[ --with-staticdatadir directory to store citadels system messages under],
[ if test "x$withval" != "xno" ; then
dnl this is a bit different than the rest,
dnl because of the citadel used to have a keys/ subdir.
AC_ARG_WITH(ssldir,
- [ --with-ssldir directory to store the ssl certificates under],
+ [ --with-ssldir directory to store the ssl certificates under],
[ if test "x$withval" != "xno" ; then
ssl_dir="$withval"
dnl Checks for where to put our utilities
AC_ARG_WITH(utility-bindir,
- [ --with-utility-bindir directory where to find helper binaries],
+ [ --with-utility-bindir directory where to find helper binaries],
[ if test "x$withval" != "xno" ; then
AC_DEFINE(HAVE_UTILBIN_DIR,[],[should we put our helper binaries to another location?])
AC_DEFINE_UNQUOTED(UTILBIN_DIR, "$withval", [were to put our helper programs])
)
+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 <iconv.h>
+ 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 <iconv.h>
+ 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"])
+
+
AC_ARG_ENABLE(threaded-client, [ --disable-threaded-client
disable multithreaded client])
AC_ARG_WITH(pam, [ --with-pam use PAM if present (see PAM.txt before you try this)])
AC_ARG_WITH(kthread, [ --with-kthread use kernel threads (on FreeBSD) (not recommended yet)])
-AC_ARG_WITH(db, [ --with-db@<:@=DIR@:>@ use Sleepycat DB 3.x @<:@DIR=/usr/local/BerkeleyDB.3.@<:@123@:>@@:>@])
+AC_ARG_WITH(db, [ --with-db@<:@=DIR@:>@ use Berkeley DB 3.x @<:@DIR=/usr/local/BerkeleyDB.3.@<:@123@:>@@:>@])
AC_ARG_WITH(ssl,
[ --with-ssl=PATH Specify path to OpenSSL installation ],
[
dnl disable backtrace if we don't want it.
AC_ARG_WITH(backtrace,
- [ --with-backtrace enable backtrace dumps in the syslog],
+ [ --with-backtrace enable backtrace dumps in the syslog],
[ if test "x$withval" != "xno" ; then
CFLAGS="$CFLAGS -rdynamic "
LDFLAGS="$LDFLAGS -rdynamic "
dnl disable backtrace if we don't want it.
AC_ARG_WITH(gprof,
- [ --with-gprof enable profiling],
+ [ --with-gprof enable profiling],
[ if test "x$withval" != "xno" ; then
CFLAGS="$CFLAGS -pg "
LDFLAGS="$LDFLAGS -pg "
dnl disable thread table reporting
AC_ARG_WITH(threadlog,
- [ --with-threadlog enable logging of thread table],
+ [ --with-threadlog enable logging of thread table],
[ if test "x$withval" != "xno" ; then
AC_DEFINE(WITH_THREADLOG, [], [Define if you want logging of the thread tables.])
fi
AC_CHECK_DB([db db-4.1 db-4 db4],
[
- DATABASE=database_sleepycat.c
+ DATABASE=database.c
],
AC_MSG_ERROR([[Can not locate a suitable Berkeley DB
library. Use --with-db=PATH to specify
dnl Checks for the libical iCalendar library.
-AC_CHECK_HEADER(ical.h,
- [AC_CHECK_LIB(ical, icalcomponent_new,
+AC_CHECK_HEADER(libical/ical.h,
+ [AC_CHECK_LIB(ical, icalcomponent_as_ical_string_r,
[
SERVER_LIBS="-lical $SERVER_LIBS"
],
,
)],
[
- AC_MSG_ERROR(ical.h 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)
]
)
echo ------------------------------------------------------------------------
echo 'zlib compression: ' $ok_zlib
echo 'LDAP support: ' $ok_ldap
+echo 'Character set conversion support:' $ok_iconv
echo 'DSpam Scanning support: ' $ok_libdspam
echo
echo 'Note: if you are not using Linux, make sure you are using GNU make'
projects / citadel.git / blobdiff