[SCM] CTDB repository - branch master updated - ctdb-2.0-1-g5f58c81

[Amitay Isaacs]

The branch, master has been updated
       via  5f58c811127a89f162b6a41ddcd6e944801740a5 (commit)
      from  cd64035d71ddff6aebe6c15a49e09527283425d2 (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5f58c811127a89f162b6a41ddcd6e944801740a5
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Nov 6 16:17:22 2012 +0100

    build: Fix the build with old system-installed tevent
    
    We depend on the tracing callback mechanism in ctdb.

-----------------------------------------------------------------------

Summary of changes:
 lib/tevent/libtevent.m4 |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

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


-- 
CTDB repository