pandora-build v0.78

diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4
index f4d1634a82ad33be3d36224994e3395ae23d59a2..c1170f158e45d83856f147527ca7d28af96e1ffa 100644 (file)
--- 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
 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
 
 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 3c15e3c6d12dada39e6ebf7bd349cdbb7ef89a8c..87e5a89d5eed7abed7b0e4b9240a23846b9ff698 100644 (file)
--- 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"])
   ]) 
 
   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],[
 ])
 
 AC_DEFUN([_PANDORA_HAVE_LIBEVENT],[

diff --git a/m4/pandora_header_assert.m4 b/m4/pandora_header_assert.m4
index eb5d15b90542a70e2f6c2f26395d7c01fc16e83b..1bd95eb58b4d316bbdb6c7f0d13484f73bbea319 100644 (file)
--- 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],
 [
 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],
   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])
 
     [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.])])
 ])
 
     [AC_DEFINE(NDEBUG, 1, [Define to 1 if assertions should be disabled.])])
 ])