dnl Process this file with autoconf to produce a configure script.
dnl $Id$
-AC_INIT([WebCit], [7.80], [http://www.citadel.org/])
+AC_INIT([WebCit], [8.13], [http://www.citadel.org/])
AC_SUBST(PROG_SUBDIRS)
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_CHECK_HEADERS(fcntl.h limits.h sys/time.h unistd.h iconv.h xlocale.h)
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
-
-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
-
+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,
]
)
+AC_MSG_CHECKING([whether your system likes memcpy + HKEY])
+AC_TRY_COMPILE([
+#define _GNU_SOURCE
+#include <ctype.h>
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdio.h>
+#include <sys/select.h>
+#include <fcntl.h>
+#include <sys/types.h>
+
+#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
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
CFLAGS="$CFLAGS -I $abs_builddir"
fi
AC_CONFIG_HEADER(sysdep.h)
-AC_OUTPUT(Makefile po/Makefile tests/Makefile)
+AC_OUTPUT(Makefile po/webcit/Makefile tests/Makefile)
if test "$abs_srcdir" != "$abs_builddir"; then
ln -s $abs_srcdir/static $abs_builddir
echo ------------------------------------------------------------------------
echo 'Character set conversion support:' $ok_iconv
echo 'National language support: ' $ok_nls
-echo 'Compression support: ' $ok_zlib
echo