Merge lp:~trond-norbye/pandora-build/libhashkit-libvbucket into lp:pandora-build

[Trond Norbye]

Adding two new macros

=== added file 'm4/pandora_have_libhashkit.m4'
--- m4/pandora_have_libhashkit.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_libhashkit.m4	2010-05-26 21:20:48 +0000
@@ -0,0 +1,41 @@
+dnl  Copyright (C) 2010 NorthScale
+dnl This file is free software; NorthScale
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([_PANDORA_SEARCH_LIBHASHKIT],[
+  AC_REQUIRE([AC_LIB_PREFIX])
+
+  dnl --------------------------------------------------------------------
+  dnl  Check for libhashkit
+  dnl --------------------------------------------------------------------
+
+  AC_ARG_ENABLE([libhashkit],
+    [AS_HELP_STRING([--disable-libhashkit],
+      [Build with libhashkit support @<:@default=on@:>@])],
+    [ac_enable_libhashkit="$enableval"],
+    [ac_enable_libhashkit="yes"])
+
+  AS_IF([test "x$ac_enable_libhashkit" = "xyes"],[
+    AC_LIB_HAVE_LINKFLAGS(hashkit,,[
+      #include <libhashkit/hashkit.h>
+    ],[
+      hashkit_st *kit = hashkit_create(NULL);
+      hashkit_free(kit);
+    ])
+  ],[
+    ac_cv_libhashkit="no"
+  ])
+
+  AM_CONDITIONAL(HAVE_LIBHASHKIT, [test "x${ac_cv_libhashkit}" = "xyes"])
+])
+
+AC_DEFUN([PANDORA_HAVE_LIBHASHKIT],[
+  AC_REQUIRE([_PANDORA_SEARCH_LIBHASHKIT])
+])
+
+AC_DEFUN([PANDORA_REQUIRE_LIBHASHKIT],[
+  AC_REQUIRE([PANDORA_HAVE_LIBHASHKIT])
+  AS_IF([test x$ac_cv_libhashkit = xno],
+      AC_MSG_ERROR([libhashkit is required for ${PACKAGE}]))
+])

=== added file 'm4/pandora_have_libvbucket.m4'
--- m4/pandora_have_libvbucket.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_libvbucket.m4	2010-05-26 21:20:48 +0000
@@ -0,0 +1,40 @@
+dnl  Copyright (C) 2010 NorthScale
+dnl This file is free software; NorthScale
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([_PANDORA_SEARCH_LIBVBUCKET],[
+  AC_REQUIRE([AC_LIB_PREFIX])
+
+  dnl --------------------------------------------------------------------
+  dnl  Check for libvbucket
+  dnl --------------------------------------------------------------------
+
+  AC_ARG_ENABLE([libvbucket],
+    [AS_HELP_STRING([--disable-libvbucket],
+      [Build with libvbucket support @<:@default=on@:>@])],
+    [ac_enable_libvbucket="$enableval"],
+    [ac_enable_libvbucket="yes"])
+
+  AS_IF([test "x$ac_enable_libvbucket" = "xyes"],[
+    AC_LIB_HAVE_LINKFLAGS(vbucket,,[
+      #include <libvbucket/vbucket.h>
+    ],[
+      VBUCKET_CONFIG_HANDLE config = vbucket_config_parse_file(NULL);
+    ])
+  ],[
+    ac_cv_libvbucket="no"
+  ])
+
+  AM_CONDITIONAL(HAVE_LIBVBUCKET, [test "x${ac_cv_libvbucket}" = "xyes"])
+])
+
+AC_DEFUN([PANDORA_HAVE_LIBVBUCKET],[
+  AC_REQUIRE([_PANDORA_SEARCH_LIBVBUCKET])
+])
+
+AC_DEFUN([PANDORA_REQUIRE_LIBVBUCKET],[
+  AC_REQUIRE([PANDORA_HAVE_LIBVBUCKET])
+  AS_IF([test x$ac_cv_libvbucket = xno],
+      AC_MSG_ERROR([libvbucket is required for ${PACKAGE}]))
+])