X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fconfigure.ac;h=6a5261d9ac0b03da3b04d4ecb6f0125e930ec3d6;hb=cbf36fcf650c83a0c9933dffbf746151e71771d2;hp=3ac9f2eb048106cc9533a51f0ddafdc2f7915c9c;hpb=8ec5a3f41a12fd1a6b890bd3726974845f1f3b6e;p=citadel.git diff --git a/webcit/configure.ac b/webcit/configure.ac index 3ac9f2eb0..6a5261d9a 100644 --- a/webcit/configure.ac +++ b/webcit/configure.ac @@ -24,7 +24,6 @@ else ssl_dir="$prefix/keys" fi -AC_ARG_WITH(with_zlib, [ --with-zlib use zlib compression if present]) AC_ARG_WITH(ssl, [ --with-ssl=PATH Specify path to OpenSSL installation ], [ @@ -159,6 +158,21 @@ fi AC_CHECK_LIB(intl, libintl_bindtextdomain, [LDFLAGS="$LDFLAGS -lintl"]) +dnl Checks for the zlib compression library. +AC_ARG_WITH(with_zlib, [ --with-zlib use zlib compression if present]) +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 + LIBS="-lz $LIBS" + AC_DEFINE(HAVE_ZLIB,[],[whether we have zlib]) +fi + + dnl Check for libcitadel AC_CHECK_HEADER(libcitadel.h, [AC_CHECK_LIB(citadel, libcitadel_version_string, @@ -193,19 +207,6 @@ AC_CHECK_HEADER(libical/ical.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 - LIBS="-lz $LIBS" - AC_DEFINE(HAVE_ZLIB,[],[whether we have zlib]) -fi - # The big search for OpenSSL if test "$with_ssl" != "no"; then