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 ],
[
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,
)
-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
PROFILE_ARGS=
#to enable debugging: export DEB_BUILD_OPTIONS="debug profiling compression urldebug"
-
-ifneq (,$(findstring compression,$(DEB_BUILD_OPTIONS)))
- ZLIB_ARGS=--without-zlib
-else
- ZLIB_ARGS=--with-zlib
-endif
ifneq (,$(findstring profiling,$(DEB_BUILD_OPTIONS)))
PROFILE_ARGS= --with-gprof
endif
--with-rundir=/var/run/citadel \
--with-ical --with-db --with-ldap \
--with-ssldir=/etc/ssl/webcit/ \
- $(ZLIB_ARGS) --with-ssl --with-libiconf \
+ --with-ssl --with-libiconf \
--with-newt --with-included-gettext \
--with-datadir=/var/run/citadel \
--enable-debug $(EXTRA_ARGS) $(PROFILE_ARGS)