X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=libcitadel%2Fconfigure.in;h=fe0c76f4f5d190bc30ecf20a0a44554656e45d66;hb=1a4ec92c7186ed2c0b9b6bf45afc47b69f3a800a;hp=93fb15e92f8f82701623425e76792e74366b855c;hpb=5da9caa44b6fb2f963ba2d8960c74d2f508d6db4;p=citadel.git diff --git a/libcitadel/configure.in b/libcitadel/configure.in index 93fb15e92..fe0c76f4f 100755 --- a/libcitadel/configure.in +++ b/libcitadel/configure.in @@ -5,25 +5,22 @@ dnl dnl Ensure that libcitadel is configured with autoconf 2.52 or newer AC_PREREQ(2.52) -AC_INIT(libcitadel, 7.61, https://uncensored.citadel.org) +AC_INIT(libcitadel, 902, http://uncensored.citadel.org) AC_CONFIG_SRCDIR(Makefile.in) AC_CONFIG_AUX_DIR(conftools) - +AC_CONFIG_SRCDIR(tests/Makefile.in) dnl -dnl Increment LIBREVISION if source code has changed at all +dnl Set LIBREVISION to the ever-ascending libcitadel version number. dnl -dnl If the API has changed, increment LIBCURRENT and set LIBREVISION to 0 +dnl If the API has changed, increment LIBCURRENT. dnl -dnl If the API changes compatibly (i.e. simply adding a new function -dnl without changing or removing earlier interfaces), then increment LIBAGE. -dnl -dnl If the API changes incompatibly set LIBAGE back to 0 +dnl Set LIBAGE to 0. dnl -LIBCURRENT=2 -LIBREVISION=0 +LIBCURRENT=4 +LIBREVISION=902 LIBAGE=0 sinclude(conftools/libtool.m4) @@ -72,6 +69,68 @@ if test "x$ok_zlib" = xyes ; then AC_DEFINE(HAVE_ZLIB,[],[whether we have zlib]) fi +AC_CHECK_HEADER(CUnit/CUnit.h, [AC_DEFINE(ENABLE_TESTS, [], [whether we should compile the test-suite])]) + +AC_CHECK_HEADER(sys/sendfile.h, [AC_DEFINE(LINUX_SENDFILE, [], [whether we have the linux sendfile api])]) +dnl TODO: we might need to check for the actual syntax.... + + +AC_MSG_CHECKING([whether your system knows about splice()]) +AC_TRY_COMPILE([ +#define _GNU_SOURCE +#include +#include +], +[ + ssize_t sent, pipesize; + int fd, SplicePipe[2]; + pipesize = splice(fd, NULL, + SplicePipe[1], NULL, + 1, + SPLICE_F_MORE | SPLICE_F_MOVE|SPLICE_F_NONBLOCK); +], + [ + ok_splice=yes + AC_DEFINE(LINUX_SPLICE, [], [whether we have the linux splice api]) + AC_MSG_RESULT([yes]) + ], + [ + ok_splice=no + AC_MSG_RESULT([no]) + ] +) + +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]) + ] +) + + AC_CHECK_HEADERS(iconv.h) @@ -165,7 +224,7 @@ AC_C_CONST AC_TYPE_SIZE_T AC_CHECK_FUNCS(memmove bcopy) -AC_CONFIG_FILES(Makefile libcitadel.pc) +AC_CONFIG_FILES(Makefile libcitadel.pc tests/Makefile) AC_CONFIG_HEADER(sysdep.h) AC_OUTPUT