projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bc33154
)
configure script check for libev version 4 or greater
author
Art Cancro
<ajc@uncensored.citadel.org>
Tue, 20 Dec 2011 20:29:24 +0000
(15:29 -0500)
committer
Art Cancro
<ajc@uncensored.citadel.org>
Tue, 20 Dec 2011 20:29:24 +0000
(15:29 -0500)
citadel/configure.ac
patch
|
blob
|
history
diff --git
a/citadel/configure.ac
b/citadel/configure.ac
index aa19866afcc29fc0e4406bd655cd2d8b58760144..0ac40df44f1e58cb3bb6ee18f60273a39fe8a1cd 100644
(file)
--- a/
citadel/configure.ac
+++ b/
citadel/configure.ac
@@
-582,7
+582,7
@@
AC_CHECK_LIB(cares, ares_init,
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $SERVER_LIBS"
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $SERVER_LIBS"
-dnl Check for
libevent
+dnl Check for
c-ares
AC_CHECK_HEADER(ares.h,
[AC_CHECK_LIB(cares, ares_init,
[
AC_CHECK_HEADER(ares.h,
[AC_CHECK_LIB(cares, ares_init,
[
@@
-600,7
+600,7
@@
CFLAGS="$saved_CFLAGS"
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $SERVER_LIBS"
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $SERVER_LIBS"
-dnl Check for libev
ent
+dnl Check for libev
AC_CHECK_HEADER(ev.h,
[AC_CHECK_LIB(ev, libcitadel_version_string,
[
AC_CHECK_HEADER(ev.h,
[AC_CHECK_LIB(ev, libcitadel_version_string,
[
@@
-617,6
+617,26
@@
AC_CHECK_HEADER(ev.h,
)
CFLAGS="$saved_CFLAGS"
)
CFLAGS="$saved_CFLAGS"
+AC_MSG_CHECKING(Checking version of libev)
+AC_TRY_RUN([
+ #include <ev.h>
+ main() {
+ printf("libev is version %d.%d\n", ev_version_major(), ev_version_minor());
+ if (ev_version_major() >= 4) {
+ exit(0);
+ }
+ exit(1);
+ }
+ ],
+ [
+ AC_MSG_RESULT(This will do just fine, thank you)
+ ],
+ [
+ AC_MSG_ERROR(Citadel requires a newer version of libev. More info: http://www.citadel.org/doku.php/installation:start)
+ ]
+)
+
+
# The big search for OpenSSL
if test "$with_ssl" != "no"; then
saved_LIBS="$LIBS"
# The big search for OpenSSL
if test "$with_ssl" != "no"; then
saved_LIBS="$LIBS"