From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 2 Dec 2009 20:48:39 +0000 (-0800)
Subject: pandora-build v0.78
X-Git-Tag: 0.37~83^2~3
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=8dd458ed6369c78de103a19511f3319ee583607c;p=m6w6%2Flibmemcached

pandora-build v0.78
---

diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4
index f4d1634a..c1170f15 100644
--- a/m4/pandora_canonical.m4
+++ b/m4/pandora_canonical.m4
@@ -4,7 +4,7 @@ dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl Which version of the canonical setup we're using
-AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.76])
+AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.78])
 
 AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
   dnl Force dependency tracking on for Sun Studio builds
diff --git a/m4/pandora_have_libevent.m4 b/m4/pandora_have_libevent.m4
index 3c15e3c6..87e5a89d 100644
--- a/m4/pandora_have_libevent.m4
+++ b/m4/pandora_have_libevent.m4
@@ -25,6 +25,15 @@ AC_DEFUN([_PANDORA_SEARCH_LIBEVENT],[
   ]) 
 
   AM_CONDITIONAL(HAVE_LIBEVENT, [test "x${ac_cv_libevent}" = "xyes"])
+
+  AS_IF([test "x${ac_cv_libevent}" = "xyes"],[
+    save_LIBS="${LIBS}"
+    LIBS="${LIBS} ${LTLIBEVENT}"
+    AC_CHECK_FUNCS(event_base_new)
+    AC_CHECK_FUNCS(event_base_free)
+    AC_CHECK_FUNCS(event_base_get_method)
+    LIBS="$save_LIBS"
+  ])
 ])
 
 AC_DEFUN([_PANDORA_HAVE_LIBEVENT],[
diff --git a/m4/pandora_header_assert.m4 b/m4/pandora_header_assert.m4
index eb5d15b9..1bd95eb5 100644
--- a/m4/pandora_header_assert.m4
+++ b/m4/pandora_header_assert.m4
@@ -8,6 +8,7 @@ dnl ----------------
 dnl Check whether to enable assertions.
 AC_DEFUN([PANDORA_HEADER_ASSERT],
 [
+  AC_CHECK_HEADERS(assert.h)
   AC_MSG_CHECKING([whether to enable assertions])
   AC_ARG_ENABLE([assert],
     [AS_HELP_STRING([--disable-assert],
@@ -16,8 +17,7 @@ AC_DEFUN([PANDORA_HEADER_ASSERT],
     [ac_cv_assert="yes"])
   AC_MSG_RESULT([$ac_cv_assert])
 
-  AS_IF([test "$ac_cv_assert" = "yes"], 
-    [AC_CHECK_HEADERS(assert.h)],
+  AS_IF([test "$ac_cv_assert" = "no"], 
     [AC_DEFINE(NDEBUG, 1, [Define to 1 if assertions should be disabled.])])
 ])