CTDB -- patch

Volker Lendecke Volker.Lendecke at SerNet.DE
Tue Nov 6 08:30:17 MST 2012


Hi!

The attached patch was required for me to compile ctdb
master on Ubuntu 12.04 with installed libtevent devel.

I know that whole library thing needs re-working, but this
fixes the build for me.

Please push if it is okay for you.

Thanks,

Volker

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de
-------------- next part --------------
From 369053cc0c3990e80605daf95e80b59c8a52dfae Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Tue, 6 Nov 2012 16:17:22 +0100
Subject: [PATCH] Fix the build with old system-installed tevent

We depend on the callback mechanism in ctdb
---
 lib/tevent/libtevent.m4 |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/tevent/libtevent.m4 b/lib/tevent/libtevent.m4
index 409232a..2141af6 100644
--- a/lib/tevent/libtevent.m4
+++ b/lib/tevent/libtevent.m4
@@ -11,7 +11,10 @@ AC_SUBST(TEVENT_CFLAGS)
 if test x"$INCLUDED_TEVENT" != x"yes" ; then
     AC_CHECK_HEADERS(tevent.h)
     AC_CHECK_LIB(tevent, tevent_context_init, [ TEVENT_LIBS="-ltevent" ])
-    if test x"$ac_cv_header_tevent_h" = x"no" -o x"$ac_cv_lib_tevent_tevent_context_init" = x"no" ; then
+    AC_CHECK_DECLS([TEVENT_TRACE_BEFORE_WAIT], [[#include <tevent.h>]])
+    if test x"$ac_cv_header_tevent_h" = x"no" -o \
+	x"$ac_cv_lib_tevent_tevent_context_init" = x"no" -o \
+	x"$ac_cv_have_decl_TEVENT_TRACE_BEFORE_WAIT" = x"no" ; then
         INCLUDED_TEVENT=yes
         TEVENT_CFLAGS=""
     else
-- 
1.7.9.5



More information about the samba-technical mailing list