X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fconfigure.ac;h=1758a77fce404290bb82fbd3087a3e900ef3d480;hb=59a81237c1365b9c7643cff7511a805f5679ed4f;hp=4e0982cbe018a3283d9bb5e527bb777bb31d51e2;hpb=8386aabb76377f93c63d819878a3c57d147e11e7;p=citadel.git

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 4e0982cbe..1758a77fc 100644
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -171,20 +171,23 @@ AC_SUBST(LOCALEDIR)
 
 
 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
-       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,
@@ -602,15 +605,17 @@ saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $SERVER_LIBS"
 dnl Check for libev
 AC_CHECK_HEADER(ev.h,
-	[AC_CHECK_LIB(ev, ev_cleanup_start,
-		[
-			LIBS="-lev -lm $LIBS $SERVER_LIBS"
-		],
+	[AC_TRY_COMPILE([#include <math.h>
+#include <ev.h>], 
+                         [
+			 ev_cleanup abort_by_shutdown;
+			 struct ev_loop *event_base;
+			 ev_cleanup_start(event_base, &abort_by_shutdown);
+			],[],
 		[
 			AC_MSG_ERROR(libev was not found or is not usable.  Please install libev.)
-		]
-	,
-	)],
+		])
+	],
 	[
 		AC_MSG_ERROR(ev.h was not found or is not usable.  Please install libev.)
 	]
@@ -618,6 +623,23 @@ AC_CHECK_HEADER(ev.h,
 CFLAGS="$saved_CFLAGS"
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 # The big search for OpenSSL
 if test "$with_ssl" != "no"; then
 	saved_LIBS="$LIBS"