Merge from tip

28 files changed, 8 insertions, 1797 deletions

diff --git a/ChangeLog b/ChangeLog
index 06fc69e1..cfa355bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-1.01 Mon Oct 24 08:00:48 PDT 2011
+1.0.2 Mon Oct 24 08:00:48 PDT 2011
 * Dropped libmemcached/memcached_util.h (undocumented header file)
 * Added memcached_touch() and memcached_touch_by_key()
 * UDP support restructured to toggle on a complete memcached_st structure.
diff --git a/configure.ac b/configure.ac
index c47a5cf1..c1b4b222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
 # Use and distribution licensed under the BSD license.  See
 # the COPYING file in this directory for full text.
 
-AC_INIT([libmemcached],[1.01],[http://libmemcached.org/])
+AC_INIT([libmemcached],[1.0.2],[http://libmemcached.org/])
 
 AC_CONFIG_AUX_DIR(config)
 
@@ -148,6 +148,12 @@ AC_TYPE_UINT32_T
 AC_TYPE_UINT64_T
 AC_TYPE_UINT8_T
 
+AC_C_BIGENDIAN
+AC_C_CONST
+AC_C_INLINE
+AC_C_VOLATILE
+AC_C_RESTRICT
+
 dnl The sasl functions should only be visible if we build with sasl support
 AS_IF([test "x$ac_cv_sasl" = "xyes"],
       [
diff --git a/m4/iconv.m4 b/m4/iconv.m4
deleted file mode 100644
index e2041b9b..00000000
--- a/m4/iconv.m4
+++ /dev/null
@@ -1,214 +0,0 @@
-# iconv.m4 serial 11 (gettext-0.18.1)
-dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
-[
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([iconv])
-])
-
-AC_DEFUN([AM_ICONV_LINK],
-[
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-
-  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed libiconv and not disabled its use
-  dnl via --without-libiconv-prefix, he wants to use it. The first
-  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
-  am_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-
-  AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-      [iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);],
-      [am_cv_func_iconv=yes])
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBICONV"
-      AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-        [iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);],
-        [am_cv_lib_iconv=yes]
-        [am_cv_func_iconv=yes])
-      LIBS="$am_save_LIBS"
-    fi
-  ])
-  if test "$am_cv_func_iconv" = yes; then
-    AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
-      dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
-      am_save_LIBS="$LIBS"
-      if test $am_cv_lib_iconv = yes; then
-        LIBS="$LIBS $LIBICONV"
-      fi
-      AC_TRY_RUN([
-#include <iconv.h>
-#include <string.h>
-int main ()
-{
-  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
-     returns.  */
-  {
-    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
-    if (cd_utf8_to_88591 != (iconv_t)(-1))
-      {
-        static const char input[] = "\342\202\254"; /* EURO SIGN */
-        char buf[10];
-        const char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_utf8_to_88591,
-                            (char **) &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          return 1;
-      }
-  }
-  /* Test against Solaris 10 bug: Failures are not distinguishable from
-     successful returns.  */
-  {
-    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
-    if (cd_ascii_to_88591 != (iconv_t)(-1))
-      {
-        static const char input[] = "\263";
-        char buf[10];
-        const char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_ascii_to_88591,
-                            (char **) &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          return 1;
-      }
-  }
-#if 0 /* This bug could be worked around by the caller.  */
-  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
-        char buf[50];
-        const char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_88591_to_utf8,
-                            (char **) &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if ((int)res > 0)
-          return 1;
-      }
-  }
-#endif
-  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
-     provided.  */
-  if (/* Try standardized names.  */
-      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
-      /* Try IRIX, OSF/1 names.  */
-      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
-      /* Try AIX names.  */
-      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
-      /* Try HP-UX names.  */
-      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    return 1;
-  return 0;
-}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
-        [case "$host_os" in
-           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
-           *)            am_cv_func_iconv_works="guessing yes" ;;
-         esac])
-      LIBS="$am_save_LIBS"
-    ])
-    case "$am_cv_func_iconv_works" in
-      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
-      *)   am_func_iconv=yes ;;
-    esac
-  else
-    am_func_iconv=no am_cv_lib_iconv=no
-  fi
-  if test "$am_func_iconv" = yes; then
-    AC_DEFINE([HAVE_ICONV], [1],
-      [Define if you have the iconv() function and it works.])
-  fi
-  if test "$am_cv_lib_iconv" = yes; then
-    AC_MSG_CHECKING([how to link with libiconv])
-    AC_MSG_RESULT([$LIBICONV])
-  else
-    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
-    dnl either.
-    CPPFLAGS="$am_save_CPPFLAGS"
-    LIBICONV=
-    LTLIBICONV=
-  fi
-  AC_SUBST([LIBICONV])
-  AC_SUBST([LTLIBICONV])
-])
-
-dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
-dnl avoid warnings like
-dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
-dnl This is tricky because of the way 'aclocal' is implemented:
-dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
-dnl   Otherwise aclocal's initial scan pass would miss the macro definition.
-dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
-dnl   Otherwise aclocal would emit many "Use of uninitialized value $1"
-dnl   warnings.
-m4_define([gl_iconv_AC_DEFUN],
-  m4_version_prereq([2.64],
-    [[AC_DEFUN_ONCE(
-        [$1], [$2])]],
-    [[AC_DEFUN(
-        [$1], [$2])]]))
-gl_iconv_AC_DEFUN([AM_ICONV],
-[
-  AM_ICONV_LINK
-  if test "$am_cv_func_iconv" = yes; then
-    AC_MSG_CHECKING([for iconv declaration])
-    AC_CACHE_VAL([am_cv_proto_iconv], [
-      AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
-    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT([
-         $am_cv_proto_iconv])
-    AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
-      [Define as const if the declaration of iconv() needs const.])
-  fi
-])
diff --git a/m4/pandora_bison.m4 b/m4/pandora_bison.m4
deleted file mode 100644
index c95896c7..00000000
--- a/m4/pandora_bison.m4
+++ /dev/null
@@ -1,33 +0,0 @@
-dnl Copyright (C) 2010 Monty Taylor
-dnl Copyright (C) 2010 Hartmut Holzgraefe
-dnl This file is free software; Monty Taylor and Hartmut Holzgraefe
-dnl give unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([_PANDORA_SEARCH_BISON],[
-
-  dnl --------------------------------------------------------------------
-  dnl  Check for bison
-  dnl --------------------------------------------------------------------
-
-  AC_CHECK_PROGS([YACC], ['bison -y'], [:])
-  AS_IF([test "x$YACC" = "x:"],[
-    pandora_have_bison=no
-    YACC='if test -f "$@"; then echo "WARNING: no proper bison binary found, ignoring changes to $<"; exit 0; else echo "ERROR: no proper bison binary found"; exit 1; fi;'
-    ],[
-    pandora_have_bison=yes
-    ])
-
-  AM_CONDITIONAL(HAVE_BISON, [test "x${pandora_have_bison}" = "xyes"])
-])
-
-AC_DEFUN([PANDORA_HAVE_BISON],[
-  AC_REQUIRE([_PANDORA_SEARCH_BISON])
-])
-
-AC_DEFUN([PANDORA_REQUIRE_BISON],[
-  AC_REQUIRE([PANDORA_HAVE_BISON])
-  AS_IF([test "x${pandora_have_bison}" = "xno" -a "$pandora_building_from_bzr" = "yes"],
-      AC_MSG_ERROR(["bison is required for ${PACKAGE} to build from a bzr branch"])
-      )
-])
diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4
index 49d4fc49..e876a8fa 100644
--- a/m4/pandora_canonical.m4
+++ b/m4/pandora_canonical.m4
@@ -6,23 +6,6 @@ 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.175])
 
-AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
-  AC_ARG_ENABLE([fat-binaries],
-    [AS_HELP_STRING([--enable-fat-binaries],
-      [Enable fat binary support on OSX @<:@default=off@:>@])],
-    [ac_enable_fat_binaries="$enableval"],
-    [ac_enable_fat_binaries="no"])
-
-  dnl Force dependency tracking on for Sun Studio builds
-  AS_IF([test "x${enable_dependency_tracking}" = "x"],[
-    enable_dependency_tracking=yes
-  ])
-  dnl If we're building OSX Fat Binaries, we have to turn off -M options
-  AS_IF([test "x${ac_enable_fat_binaries}" = "xyes"],[
-    enable_dependency_tracking=no
-  ])
-])
-
 AC_DEFUN([PANDORA_BLOCK_BAD_OPTIONS],[
   AS_IF([test "x${prefix}" = "x"],[
     AC_MSG_ERROR([--prefix requires an argument])
@@ -31,7 +14,6 @@ AC_DEFUN([PANDORA_BLOCK_BAD_OPTIONS],[
 
 dnl The standard setup for how we build Pandora projects
 AC_DEFUN([PANDORA_CANONICAL_TARGET],[
-  AC_REQUIRE([PANDORA_FORCE_DEPEND_TRACKING])
   ifdef([m4_define],,[define([m4_define],   defn([define]))])
   ifdef([m4_undefine],,[define([m4_undefine],   defn([undefine]))])
   m4_define([PCT_ALL_ARGS],[$*])
@@ -149,12 +131,6 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
   PANDORA_CHECK_C_VERSION
   PANDORA_CHECK_CXX_VERSION
 
-  AC_C_BIGENDIAN
-  AC_C_CONST
-  AC_C_INLINE
-  AC_C_VOLATILE
-  AC_C_RESTRICT
-
   AC_HEADER_TIME
   AC_STRUCT_TM
   AC_TYPE_SIZE_T
@@ -221,17 +197,6 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
 
   PANDORA_OPTIMIZE
 
-  AC_LANG_PUSH(C++)
-  # Test whether madvise() is declared in C++ code -- it is not on some
-  # systems, such as Solaris
-  AC_CHECK_DECLS([madvise], [], [], [AC_INCLUDES_DEFAULT[
-  #if HAVE_SYS_MMAN_H
-  #include <sys/types.h>
-  #include <sys/mman.h>
-  #endif
-  ]])
-  AC_LANG_POP()
-
   PANDORA_HAVE_GCC_ATOMICS
 
   PANDORA_HEADER_ASSERT
@@ -242,9 +207,7 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
 
   AC_LIB_PREFIX
   PANDORA_HAVE_BETTER_MALLOC
-  PANDORA_WITH_VALGRIND
 
-  AC_CHECK_PROGS([DOXYGEN], [doxygen])
   AC_CHECK_PROGS([PERL], [perl])
   AC_CHECK_PROGS([DPKG_GENSYMBOLS], [dpkg-gensymbols], [:])
   AC_CHECK_PROGS([LCOV], [lcov], [echo lcov not found])
diff --git a/m4/pandora_flex.m4 b/m4/pandora_flex.m4
deleted file mode 100644
index 0fb2f81c..00000000
--- a/m4/pandora_flex.m4
+++ /dev/null
@@ -1,33 +0,0 @@
-dnl Copyright (C) 2010 Monty Taylor
-dnl Copyright (C) 2010 Hartmut Holzgraefe
-dnl This file is free software; Monty Taylor and Hartmut Holzgraefe
-dnl give unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([_PANDORA_SEARCH_FLEX],[
-
-  dnl --------------------------------------------------------------------
-  dnl  Check for flex
-  dnl --------------------------------------------------------------------
-
-  AC_CHECK_PROGS([LEX], ['flex'], [:])
-  AS_IF([test "x$LEX" = "x:"],[
-    pandora_have_flex=no
-    LEX='if test -f "$@"; then echo "WARNING: no proper flex binary found, ignoring changes to $<"; exit 0; else echo "ERROR: no proper flex binary found"; exit 1; fi;'
-    ],[
-    pandora_have_flex=yes
-    ])
-
-  AM_CONDITIONAL(HAVE_FLEX, [test "x${pandora_have_flex}" = "xyes"])
-])
-
-AC_DEFUN([PANDORA_HAVE_FLEX],[
-  AC_REQUIRE([_PANDORA_SEARCH_FLEX])
-])
-
-AC_DEFUN([PANDORA_REQUIRE_FLEX],[
-  AC_REQUIRE([PANDORA_HAVE_FLEX])
-  AS_IF([test "x${pandora_have_flex}" = "xno" -a "$pandora_building_from_bzr" = "yes"],
-      AC_MSG_ERROR(["flex is required for ${PACKAGE} to build from a bzr branch"])
-      )
-])
diff --git a/m4/pandora_have_boost.m4 b/m4/pandora_have_boost.m4
deleted file mode 100644
index 2a571dbb..00000000
--- a/m4/pandora_have_boost.m4
+++ /dev/null
@@ -1,93 +0,0 @@
-dnl Copyright (C) 2010 Monty Taylor
-dnl This file is free software; Monty Taylor
-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_BOOST],[
-  AC_REQUIRE([AC_LIB_PREFIX])
-
-  dnl --------------------------------------------------------------------
-  dnl  Check for boost
-  dnl --------------------------------------------------------------------
-
-  AC_ARG_ENABLE([boost],
-    [AS_HELP_STRING([--disable-boost],
-      [Build with boost support @<:@default=on@:>@])],
-    [ac_enable_boost="$enableval"],
-    [ac_enable_boost="yes"])
-
-  AS_IF([test "x$ac_enable_boost" = "xyes"],[
-    dnl link against libc because we're just looking for headers here
-    AC_LANG_PUSH(C++)
-    AC_LIB_HAVE_LINKFLAGS(c,,
-      [#include <boost/pool/pool.hpp>],
-      [boost::pool<> test_pool(1);],
-      [system])
-    AC_LANG_POP()
-  ],[
-    ac_cv_boost="no"
-  ])
-  
-
-  AS_IF([test "x$1" != "x"],[
-    AC_CACHE_CHECK([if boost is recent enough],
-      [pandora_cv_recent_boost],[
-      pandora_need_boost_version=`echo "$1" | perl -nle '/(\d+)\.(\d+)/; printf "%d%0.3d00", $[]1, $[]2 ;'`
-      AS_IF([test "x${pandora_need_boost_version}" = "x000000"],[
-        pandora_cv_recent_boost=yes
-      ],[
-        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <boost/version.hpp>
-
-#if BOOST_VERSION < ${pandora_need_boost_version}
-# error boost too old!
-#endif
-          ]],[[]])
-        ],[
-          pandora_cv_recent_boost=yes
-        ],[
-          pandora_cv_recent_boost=no
-        ])
-      ])
-    ])
-    AS_IF([test "x${pandora_cv_recent_boost}" = "xno"],[
-      ac_cv_boost=no
-    ])
-  ])
-
-  AS_IF([test "x${ac_gcc_profile_mode}" = "xyes"],[
-    AC_CACHE_CHECK([if boost is recent enough for GCC Profile Mode],
-      [pandora_cv_boost_profile],[
-      pandora_need_boost_version=104300
-      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <boost/version.hpp>
-
-#if BOOST_VERSION < ${pandora_need_boost_version}
-# error boost too old!
-#endif
-          ]],[[]])
-        ],[
-        pandora_cv_boost_profile=yes
-        ],[
-        pandora_cv_boost_profile=no
-        ])
-    ])
-    AS_IF([test "x${pandora_cv_boost_profile}" = "xyes"],[
-      AC_DEFINE([BOOST_DETAIL_NO_CONTAINER_FWD],[1],[Disable forward decl of stl in boost])
-    ])
-  ])
-
-  AM_CONDITIONAL(HAVE_BOOST, [test "x${ac_cv_boost}" = "xyes"])
-  
-])
-
-AC_DEFUN([PANDORA_HAVE_BOOST],[
-  _PANDORA_SEARCH_BOOST($1)
-])
-
-AC_DEFUN([PANDORA_REQUIRE_BOOST],[
-  PANDORA_HAVE_BOOST($1)
-  AS_IF([test x$ac_cv_boost = xno],
-      AC_MSG_ERROR([boost is required for ${PACKAGE}]))
-])
-
diff --git a/m4/pandora_have_libbdb.m4 b/m4/pandora_have_libbdb.m4
deleted file mode 100644
index 443d3cc2..00000000
--- a/m4/pandora_have_libbdb.m4
+++ /dev/null
@@ -1,40 +0,0 @@
-dnl  Copyright (C) 2009 Sun Microsystems, Inc.
-dnl This file is free software; Sun Microsystems, Inc.
-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_LIBBDB],[
-  AC_REQUIRE([AC_LIB_PREFIX])
-
-  dnl --------------------------------------------------------------------
-  dnl  Check for bekerely db
-  dnl --------------------------------------------------------------------
-
-  AC_ARG_ENABLE([libbdb],
-    [AS_HELP_STRING([--disable-libbdb],
-      [Build with libbdb support @<:@default=on@:>@])],
-    [ac_enable_libbdb="$enableval"],
-    [ac_enable_libbdb="yes"])
-
-  AS_IF([test "x$ac_enable_libbdb" = "xyes"],[
-    AC_LIB_HAVE_LINKFLAGS(db,,[
-      #include <db.h>
-    ],[
-      const char *test= DB_VERSION_STRING;
-    ])
-  ],[
-    ac_cv_libbdb="no"
-  ])
-
-  AM_CONDITIONAL(HAVE_LIBBDB, [test "x${ac_cv_libbdb}" = "xyes"])
-])
-
-AC_DEFUN([PANDORA_HAVE_LIBBDB],[
-  AC_REQUIRE([_PANDORA_SEARCH_LIBBDB])
-])
-
-AC_DEFUN([PANDORA_REQUIRE_LIBBDB],[
-  AC_REQUIRE([_PANDORA_SEARCH_LIBBDB])
-  AS_IF([test "x${ac_cv_libbdb}" = "xno"],
-    AC_MSG_ERROR([libbdb is required for ${PACKAGE}]))
-])
diff --git a/m4/pandora_have_libcassandra.m4 b/m4/pandora_have_libcassandra.m4
deleted file mode 100644
index e61eb2f4..00000000
--- a/m4/pandora_have_libcassandra.m4
+++ /dev/null
@@ -1,44 +0,0 @@
-dnl  Copyright (C) 2010 Padraig O'Sullivan
-dnl This file is free software; 
-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_LIBCASSANDRA],[
-  AC_REQUIRE([AC_LIB_PREFIX])
-
-  dnl --------------------------------------------------------------------
-  dnl  Check for libcassandra
-  dnl --------------------------------------------------------------------
-
-  AC_ARG_ENABLE([libcassandra],
-    [AS_HELP_STRING([--disable-libcassandra],
-      [Build with libcassandra support @<:@default=on@:>@])],
-    [ac_enable_libcassandra="$enableval"],
-    [ac_enable_libcassandra="yes"])
-
-  AS_IF([test "x$ac_enable_libcassandra" = "xyes"],[
-    AC_LANG_PUSH([C++])
-    AC_LIB_HAVE_LINKFLAGS(cassandra,[thrift],[
-      #include <libcassandra/cassandra_factory.h>
-    ],[
-       libcassandra::CassandraFactory fact("localhost", 9306);
-    ])
-    AC_LANG_POP()
-  ],[
-    ac_cv_libcassandra="no"
-  ])
-  
-  AM_CONDITIONAL(HAVE_LIBCASSANDRA, [test "x${ac_cv_libcassandra}" = "xyes"])
-  
-])
-
-AC_DEFUN([PANDORA_HAVE_LIBCASSANDRA],[
-  AC_REQUIRE([_PANDORA_SEARCH_LIBCASSANDRA])
-])
-
-AC_DEFUN([PANDORA_REQUIRE_LIBCASSANDRA],[
-  AC_REQUIRE([PANDORA_HAVE_LIBCASSANDRA])
-  AS_IF([test "x$ac_cv_libcassandra" = "xno"],[
-      AC_MSG_ERROR([libcassandra is required for ${PACKAGE}])
-  ])
-])
diff --git a/m4/pandora_have_libcurl.m4 b/m4/pandora_have_libcurl.m4
deleted file mode 100644
index d86ee3e5..00000000
--- a/m4/pandora_have_libcurl.m4
+++ /dev/null
@@ -1,62 +0,0 @@
-dnl Copyright (C) 2010 Monty Taylor
-dnl This file is free software;  Monty Taylor
-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_LIBCURL],[
-  AC_REQUIRE([AC_LIB_PREFIX])
-
-  dnl --------------------------------------------------------------------
-  dnl  Check for libcurl
-  dnl --------------------------------------------------------------------
-
-  AC_ARG_ENABLE([libcurl],
-    [AS_HELP_STRING([--disable-libcurl],
-      [Build with libcurl support @<:@default=on@:>@])],
-    [ac_enable_libcurl="$enableval"],
-    [ac_enable_libcurl="yes"])
-
-  AS_IF([test "x$ac_enable_libcurl" = "xyes"],[
-    AC_LIB_HAVE_LINKFLAGS(curl,,
-      [#include <curl/curl.h>],
-      [
-        CURL *handle;
-        handle=curl_easy_init();
-      ])
-    ],[
-      ac_cv_libcurl="no"
-    ])
-
-  AC_CACHE_CHECK([if libcurl has CURLOPT_USERNAME],
-                 [pandora_cv_curl_have_username],[
-     AC_COMPILE_IFELSE([
-       AC_LANG_PROGRAM(
-         [[
-           CURL *handle;
-           handle=curl_easy_init();
-           rv= curl_easy_setopt(curl_handle, CURLOPT_USERNAME, "foo");
-         ]])],
-       [pandora_cv_curl_have_username=yes],
-       [pandora_cv_curl_have_username=no])
-     ])
-
-  AM_CONDITIONAL(HAVE_LIBCURL,[test "x${ac_cv_libcurl}" = "xyes"])
-  AS_IF([test "x$pandora_cv_curl_have_username" = "xyes"],
-        AC_DEFINE([HAVE_CURLOPT_USERNAME],[1],
-                  [Does libcurl provide the CURLOPT_USERNAME constant]))
-
-])
-
-AC_DEFUN([PANDORA_HAVE_LIBCURL],[
-  AC_REQUIRE([_PANDORA_SEARCH_LIBCURL])
-  AS_IF([test "x${ac_cv_libcurl}" = "xno"],[
-    AC_MSG_WARN([libcurl development lib not found. On Debian this is found in libcurl4-gnutls-dev. On RHEL5/Fedora11 it's in curl-devel. On RHEL6/Fedora12 it's in libcurl-devel.])
-  ])
-])
-
-AC_DEFUN([PANDORA_REQUIRE_LIBCURL],[
-  PANDORA_HAVE_LIBCURL($1)
-  AS_IF([test "x${ac_cv_libcurl}" = "xno"],[
-    AC_MSG_ERROR([libcurl is required for ${PACKAGE}])
-  ])
-])
diff --git a/m4/pandora_have_libhashkit.m4 b/m4/pandora_have_libhashkit.m4
deleted file mode 100644
index 4e7965e5..00000000
--- a/m4/pandora_have_libhashkit.m4
+++ /dev/null
@@ -1,42 +0,0 @@
-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 foo;
-      hashkit_st *kit = hashkit_create(&foo);
-      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}]))
-])
diff --git a/m4/pandora_have_libldap.m4 b/m4/pandora_have_libldap.m4
deleted file mode 100644
index 7533e856..00000000
--- a/m4/pandora_have_libldap.m4
+++ /dev/null
@@ -1,73 +0,0 @@
-dnl  Copyright (C) 2009 Sun Microsystems, Inc.
-dnl This file is free software; Sun Microsystems, Inc.
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-#--------------------------------------------------------------------
-# Check for libldap
-#--------------------------------------------------------------------
-
-
-AC_DEFUN([_PANDORA_SEARCH_LIBLDAP],[
-  AC_REQUIRE([AC_LIB_PREFIX])
-
-  AC_LIB_HAVE_LINKFLAGS(ldap,,
-  [#include <ldap.h>],
-  [
-    LDAP *ldap;
-    ldap_initialize(&ldap, "ldap://localhost/");
-  ])
-  AS_IF([test "x$ac_cv_libldap" = "xno"],
-  [
-    unset ac_cv_libldap
-    unset HAVE_LIBLDAP
-    unset LIBLDAP
-    unset LIBLDAP_PREFIX
-    unset LTLIBLDAP
-    AC_LIB_HAVE_LINKFLAGS(ldap,,
-    [#include <ldap/ldap.h>],
-    [
-      LDAP *ldap;
-      ldap_initialize(&ldap, "ldap://localhost/");
-    ])
-    AS_IF([test "x$ac_cv_libldap" = "xyes"], [
-      ac_cv_ldap_location="<ldap/ldap.h>"
-    ])
-  ],[
-    ac_cv_ldap_location="<ldap.h>"
-  ])
-
-  AM_CONDITIONAL(HAVE_LIBLDAP, [test "x${ac_cv_libldap}" = "xyes"])
-])
-
-AC_DEFUN([_PANDORA_HAVE_LIBLDAP],[
-
-  AC_ARG_ENABLE([libldap],
-    [AS_HELP_STRING([--disable-libldap],
-      [Build with libldap support @<:@default=on@:>@])],
-    [ac_enable_libldap="$enableval"],
-    [ac_enable_libldap="yes"])
-
-  _PANDORA_SEARCH_LIBLDAP
-])
-
-
-AC_DEFUN([PANDORA_HAVE_LIBLDAP],[
-  AC_REQUIRE([_PANDORA_HAVE_LIBLDAP])
-])
-
-AC_DEFUN([_PANDORA_REQUIRE_LIBLDAP],[
-  ac_enable_libldap="yes"
-  _PANDORA_SEARCH_LIBLDAP
-
-  AS_IF([test x$ac_cv_libldap = xno],[
-    AC_MSG_ERROR([libldap is required for ${PACKAGE}. On Debian this can be found in libldap2-dev. On RedHat this can be found in openldap-devel.])
-  ],[
-    AC_DEFINE_UNQUOTED(LDAP_HEADER,[${ac_cv_ldap_location}],
-                       [Location of ldap header])
-  ])
-])
-
-AC_DEFUN([PANDORA_REQUIRE_LIBLDAP],[
-  AC_REQUIRE([_PANDORA_REQUIRE_LIBLDAP])
-])
diff --git a/m4/pandora_have_libmemcached.m4 b/m4/pandora_have_libmemcached.m4
deleted file mode 100644
index a281306b..00000000
--- a/m4/pandora_have_libmemcached.m4
+++ /dev/null
@@ -1,106 +0,0 @@
-dnl  Copyright (C) 2009 Sun Microsystems, Inc.
-dnl This file is free software; Sun Microsystems, Inc.
-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_LIBMEMCACHED],[
-  AC_REQUIRE([AC_LIB_PREFIX])
-
-  dnl --------------------------------------------------------------------
-  dnl  Check for libmemcached
-  dnl --------------------------------------------------------------------
-
-  AC_ARG_ENABLE([libmemcached],
-    [AS_HELP_STRING([--disable-libmemcached],
-      [Build with libmemcached support @<:@default=on@:>@])],
-    [ac_enable_libmemcached="$enableval"],
-    [ac_enable_libmemcached="yes"])
-
-  AS_IF([test "x$ac_enable_libmemcached" = "xyes"],[
-    AC_LIB_HAVE_LINKFLAGS(memcached,,[
-      #include <libmemcached/memcached.h>
-    ],[
-      memcached_st memc;
-      memcached_dump_func *df;
-      memcached_lib_version();
-    ])
-  ],[
-    ac_cv_libmemcached="no"
-  ])
-
-  AS_IF([test "x$ac_enable_libmemcached" = "xyes"],[
-    AC_LIB_HAVE_LINKFLAGS(memcachedprotocol,,[
-      #include <libmemcached/protocol_handler.h>
-    ],[
-      struct memcached_protocol_st *protocol_handle;
-      protocol_handle= memcached_protocol_create_instance();
-    ])
-  ],[
-    ac_cv_libmemcachedprotocol="no"
-  ])
-  
-  AC_CACHE_CHECK([if libmemcached has memcached_server_fn],
-    [pandora_cv_libmemcached_server_fn],
-    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <libmemcached/memcached.h>
-memcached_server_fn callbacks[1];
-    ]])],
-    [pandora_cv_libmemcached_server_fn=yes],
-    [pandora_cv_libmemcached_server_fn=no])])
-
-  AS_IF([test "x$pandora_cv_libmemcached_server_fn" = "xyes"],[
-    AC_DEFINE([HAVE_MEMCACHED_SERVER_FN],[1],[If we have the new memcached_server_fn typedef])
-  ])
-])
-
-AC_DEFUN([_PANDORA_RECENT_LIBMEMCACHED],[
-
-  AC_CACHE_CHECK([if libmemcached is recent enough],
-    [pandora_cv_recent_libmemcached],[
-    AS_IF([test "x${ac_cv_libmemcached}" = "xno"],[
-      pandora_cv_recent_libmemcached=no
-    ],[
-      AS_IF([test "x$1" != "x"],[
-        pandora_need_libmemcached_version=`echo "$1" | perl -nle '/(\d+)\.(\d+)/; printf "%d%0.3d000", $[]1, $[]2 ;'`
-        AS_IF([test "x${pandora_need_libmemcached_version}" = "x0000000"],[
-          pandora_cv_recent_libmemcached=yes
-        ],[
-          AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <libmemcached/configure.h>
-
-#if !defined(LIBMEMCACHED_VERSION_HEX) || LIBMEMCACHED_VERSION_HEX < 0x]]${pandora_need_libmemcached_version}[[
-# error libmemcached too old!
-#endif
-            ]],[[]])
-          ],[
-            pandora_cv_recent_libmemcached=yes
-          ],[
-            pandora_cv_recent_libmemcached=no
-          ])
-        ])
-      ],[
-        pandora_cv_recent_libmemcached=yes
-      ])
-    ])
-  ])
-
-  AM_CONDITIONAL(HAVE_LIBMEMCACHED,[test "x${ac_cv_libmemcached}" = "xyes" -a "x${pandora_cv_recent_libmemcached}" = "xyes"])
-  
-])
-
-AC_DEFUN([PANDORA_HAVE_LIBMEMCACHED],[
-  AC_REQUIRE([_PANDORA_SEARCH_LIBMEMCACHED])
-  _PANDORA_RECENT_LIBMEMCACHED($1)
-])
-
-AC_DEFUN([PANDORA_REQUIRE_LIBMEMCACHED],[
-  PANDORA_HAVE_LIBMEMCACHED($1)
-  AS_IF([test "x{$pandora_cv_recent_libmemcached}" = "xno"],
-      AC_MSG_ERROR([libmemcached is required for ${PACKAGE}]))
-])
-
-AC_DEFUN([PANDORA_REQUIRE_LIBMEMCACHEDPROTOCOL],[
-  PANDORA_HAVE_LIBMEMCACHED($1)
-  AS_IF([test x$ac_cv_libmemcachedprotocol = xno],
-      AC_MSG_ERROR([libmemcachedprotocol is required for ${PACKAGE}]))
-])
diff --git a/m4/pandora_have_libndbclient.m4 b/m4/pandora_have_libndbclient.m4
deleted file mode 100644
index 08337ea7..00000000
--- a/m4/pandora_have_libndbclient.m4
+++ /dev/null
@@ -1,80 +0,0 @@
-dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*-
-dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
-dnl
-dnl  Copyright (C) 2010 Monty Taylor
-dnl  This file is free software; Sun Microsystems
-dnl  gives unlimited permission to copy and/or distribute it,
-dnl  with or without modifications, as long as this notice is preserved.
-dnl
-
-AC_DEFUN([_PANDORA_SEARCH_LIBNDBCLIENT],[
-
-  AC_REQUIRE([AC_LIB_PREFIX])
-  AC_REQUIRE([PANDORA_WITH_MYSQL])
-
-  AC_ARG_ENABLE([libndbclient],
-    [AS_HELP_STRING([--disable-libndbclient],
-      [Build with libndbclient support @<:@default=on@:>@])],
-    [ac_enable_libndbclient="$enableval"],
-    [ac_enable_libndbclient="yes"])
-
-  AC_ARG_WITH([libndbclient-prefix],
-    [AS_HELP_STRING([--with-libndbclient-prefix],
-      [search for libndbclient in DIR])],
-    [ac_with_libndbclient=${withval}],
-    [ac_with_libndbclient=${pandora_cv_mysql_base}])
-
-  save_LIBS="${LIBS}"
-  LIBS=""
-  save_CPPFLAGS="${CPPFLAGS}"
-  AS_IF([test "x${ac_with_libndbclient}" != "x"],[
-    LIBS="-L${ac_with_libndbclient}/lib/mysql -L${ac_with_libndbclient}/lib"
-    AS_IF([test "$GCC" = "yes"],[
-      ndb_include_prefix="-isystem "
-    ],[
-      ndb_include_prefix="-I"
-    ])
-    CPPFLAGS="${CPPFLAGS} ${ndb_include_prefix}${ac_with_libndbclient}/include ${ndb_include_prefix}${ac_with_libndbclient}/include/mysql ${ndb_include_prefix}${ac_with_libndbclient}/include/mysql/storage/ndb ${ndb_include_prefix}${ac_with_libndbclient}/include/mysql/storage/ndb/ndbapi ${ndb_include_prefix}${ac_with_libndbclient}/include/mysql/storage/ndb/mgmapi"
-  ])
-  LIBS="${LIBS} -lndbclient -lmysqlclient_r"
-
-  AC_CACHE_CHECK([if NdbApi works],[ac_cv_libndbclient],[
-    AC_LANG_PUSH(C++)
-    AC_LINK_IFELSE([
-      AC_LANG_PROGRAM([[
-#include <NdbApi.hpp>
-      ]],[[
-Ndb *ndb;
-ndb_init();
-      ]])
-    ],[
-      ac_cv_libndbclient=yes
-    ],[
-      ac_cv_libndbclient=no
-    ])
-  ])
-  AC_LANG_POP()
-
-  LIBNDBCLIENT="${LIBS}"
-  LTLIBNDBCLIENT="${LIBS}"
-  AC_SUBST([LIBNDBCLIENT])
-  AC_SUBST([LTLIBNDBCLIENT])
-
-  AS_IF([test "x${ac_cv_libndbclient}" = "xno"],[
-    CPPFLAGS="${save_CPPFLAGS}"
-  ])    
-  LIBS="${save_LIBS}"
-  
-  AM_CONDITIONAL(HAVE_LIBNDBCLIENT, [test "x${ac_cv_libndbclient}" = "xyes"])
-])
-  
-AC_DEFUN([PANDORA_HAVE_LIBNDBCLIENT],[
-  AC_REQUIRE([_PANDORA_SEARCH_LIBNDBCLIENT])
-])
-
-AC_DEFUN([PANDORA_REQUIRE_LIBNDBCLIENT],[
-  AC_REQUIRE([PANDORA_HAVE_LIBNDBCLIENT])
-  AS_IF([test "x${ac_cv_libndbclient}" = "xno"],
-      AC_MSG_ERROR([libndbclient is required for ${PACKAGE}]))
-])
-
diff --git a/m4/pandora_have_libtokyocabinet.m4 b/m4/pandora_have_libtokyocabinet.m4
deleted file mode 100644
index 91906a7c..00000000
--- a/m4/pandora_have_libtokyocabinet.m4
+++ /dev/null
@@ -1,54 +0,0 @@
-dnl  Copyright (C) 2009 Sun Microsystems, Inc.
-dnl This file is free software; Sun Microsystems, Inc.
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
- 
-dnl Provides support for finding libtokyocabinet.
-dnl LIBTOKYOCABINET_CFLAGS will be set, in addition to LIBTOKYOCABINET and LTLIBTOKYOCABINET
-
-AC_DEFUN([_PANDORA_SEARCH_LIBTOKYOCABINET],[
-  AC_REQUIRE([AC_LIB_PREFIX])
-
-  dnl --------------------------------------------------------------------
-  dnl  Check for libtokyocabinet
-  dnl --------------------------------------------------------------------
-
-  AC_ARG_ENABLE([libtokyocabinet],
-    [AS_HELP_STRING([--disable-libtokyocabinet],
-      [Build with libtokyocabinet support @<:@default=on@:>@])],
-    [ac_enable_libtokyocabinet="$enableval"],
-    [ac_enable_libtokyocabinet="yes"])
-
-  AS_IF([test "x$ac_enable_libtokyocabinet" = "xyes"],[
-    AC_LIB_HAVE_LINKFLAGS(tokyocabinet,,[
-#include <tcutil.h>
-#include <tcadb.h>
-    ],[
-const char *test= tcversion;
-bool ret= tcadboptimize(NULL, "params");
-    ])
-  ],[
-    ac_cv_libtokyocabinet="no"
-  ])
-
-  AS_IF([test "${ac_cv_libtokyocabinet}" = "no" -a "${ac_enable_libtokyocabinet}" = "yes"],[
-
-    PKG_CHECK_MODULES([LIBTOKYOCABINET], [libtokyocabinet >= 1.4.15], [
-      ac_cv_libtokyocabinet=yes
-      LTLIBTOKYOCABINET=${LIBTOKYOCABINET_LIBS}
-      LIBTOKYOCABINET=${LIBTOKYOCABINET_LIBS}
-    ],[test x = y])
-  ])
-
-  AM_CONDITIONAL(HAVE_LIBTOKYOCABINET, [test "${ac_cv_libtokyocabinet}" = "yes"])
-])
-
-AC_DEFUN([PANDORA_HAVE_LIBTOKYOCABINET],[
-  AC_REQUIRE([_PANDORA_SEARCH_LIBTOKYOCABINET])
-])
-
-AC_DEFUN([PANDORA_REQUIRE_LIBTOKYOCABINET],[
-  AC_REQUIRE([_PANDORA_SEARCH_LIBTOKYOCABINET])
-  AS_IF([test "x${ac_cv_libtokyocabinet}" = "xno"],
-    AC_MSG_ERROR([libtokyocabinet is required for ${PACKAGE}. On Debian systems this is found in libtokyocabinet-dev. On RedHat, in tokyocabinet-devel.]))
-])
diff --git a/m4/pandora_have_libxml2.m4 b/m4/pandora_have_libxml2.m4
deleted file mode 100644
index 76c5805c..00000000
--- a/m4/pandora_have_libxml2.m4
+++ /dev/null
@@ -1,52 +0,0 @@
-dnl  Copyright (C) 2009 Sun Microsystems, Inc.
-dnl This file is free software; Sun Microsystems, Inc.
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
- 
-dnl Provides support for finding libxml2.
-dnl LIBXML2_CFLAGS will be set, in addition to LIBXML2 and LTLIBXML2
-
-AC_DEFUN([_PANDORA_SEARCH_LIBXML2],[
-  AC_REQUIRE([AC_LIB_PREFIX])
-
-  dnl --------------------------------------------------------------------
-  dnl  Check for libxml2
-  dnl --------------------------------------------------------------------
-
-  AC_ARG_ENABLE([libxml2],
-    [AS_HELP_STRING([--disable-libxml2],
-      [Build with libxml2 support @<:@default=on@:>@])],
-    [ac_enable_libxml2="$enableval"],
-    [ac_enable_libxml2="yes"])
-
-  AS_IF([test "x$ac_enable_libxml2" = "xyes"],[
-    AC_LIB_HAVE_LINKFLAGS(xml2,,[
-#include <libxml/xmlversion.h>
-    ],[
-const char *test= LIBXML_DOTTED_VERSION;
-    ])
-  ],[
-    ac_cv_libxml2="no"
-  ])
-
-  AS_IF([test "${ac_cv_libxml2}" = "no" -a "${ac_enable_libxml2}" = "yes"],[
-
-    PKG_CHECK_MODULES([LIBXML2], [libxml-2.0], [
-      ac_cv_libxml2=yes
-      LTLIBXML2=${LIBXML2_LIBS}
-      LIBXML2=${LIBXML2_LIBS}
-    ],[])
-  ])
-
-  AM_CONDITIONAL(HAVE_LIBXML2, [test "${ac_cv_libxml2}" = "yes"])
-])
-
-AC_DEFUN([PANDORA_HAVE_LIBXML2],[
-  AC_REQUIRE([_PANDORA_SEARCH_LIBXML2])
-])
-
-AC_DEFUN([PANDORA_REQUIRE_LIBXML2],[
-  AC_REQUIRE([_PANDORA_SEARCH_LIBXML2])
-  AS_IF([test "x${ac_cv_libxml2}" = "xno"],
-    AC_MSG_ERROR([libxml2 is required for ${PACKAGE}. On Debian systems this is found in libxml2-dev. On RedHat, libxml2-devel.]))
-])
diff --git a/m4/pandora_have_thrift.m4 b/m4/pandora_have_thrift.m4
deleted file mode 100644
index b0b3a6c0..00000000
--- a/m4/pandora_have_thrift.m4
+++ /dev/null
@@ -1,45 +0,0 @@
-dnl  Copyright (C) 2010 Padraig O'Sullivan
-dnl This file is free software; Padraig O'Sullivan
-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_THRIFT],[
-  AC_REQUIRE([AC_LIB_PREFIX])
-
-  dnl --------------------------------------------------------------------
-  dnl  Check for thrift
-  dnl --------------------------------------------------------------------
-
-  AC_ARG_ENABLE([thrift],
-    [AS_HELP_STRING([--disable-thrift],
-      [Build with thrift support @<:@default=on@:>@])],
-    [ac_enable_thrift="$enableval"],
-    [ac_enable_thrift="yes"])
-
-  AS_IF([test "x$ac_enable_thrift" = "xyes"],[
-    AC_LANG_PUSH(C++)
-    AC_LIB_HAVE_LINKFLAGS(thrift,,[
-      #include <thrift/Thrift.h>
-    ],[
-      apache::thrift::TOutput test_output;
-    ])
-    AC_LANG_POP()
-  ],[
-    ac_cv_thrift="no"
-  ])
-  
-  AM_CONDITIONAL(HAVE_THRIFT, [test "x${ac_cv_thrift}" = "xyes"])
-  
-])
-
-AC_DEFUN([PANDORA_HAVE_THRIFT],[
-  AC_REQUIRE([_PANDORA_SEARCH_THRIFT])
-])
-
-AC_DEFUN([PANDORA_REQUIRE_THRIFT],[
-  AC_REQUIRE([PANDORA_HAVE_THRIFT])
-  AS_IF([test x$ac_cv_thrift= xno],[
-      AC_MSG_ERROR([thrift required for ${PACKAGE}])
-  ])
-])
-
diff --git a/m4/pandora_intltool.m4 b/m4/pandora_intltool.m4
deleted file mode 100644
index b3e70625..00000000
--- a/m4/pandora_intltool.m4
+++ /dev/null
@@ -1,225 +0,0 @@
-## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*-
-## Copyright (C) 2001 Eazel, Inc.
-## Author: Maciej Stachowiak <mjs@noisehavoc.org>
-##         Kenneth Christiansen <kenneth@gnu.org>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Place - Suite 330, Boston, MA 02110-1301, USA.
-##
-## As a special exception to the GNU General Public License, if you
-## distribute this file as part of a program that contains a
-## configuration script generated by Autoconf, you may include it under
-## the same distribution terms that you use for the rest of that program.
-
-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 40 IT_PROG_INTLTOOL
-AC_DEFUN([IT_PROG_INTLTOOL], [
-AC_PREREQ([2.50])dnl
-AC_REQUIRE([AM_NLS])dnl
-
-case "$am__api_version" in
-    1.[01234])
-	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
-    ;;
-    *)
-    ;;
-esac
-
-if test -n "$1"; then
-    AC_MSG_CHECKING([for intltool >= $1])
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-    [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    ]
-    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-    AS_IF([test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"],[
-      pandora_have_intltool=yes
-    ],[
-      pandora_have_intltool=no
-      AC_MSG_WARN([Your intltool is too old.  You need intltool $1 or later.])
-    ])
-fi
-AC_CHECK_HEADERS([libintl.h])
-AS_IF([test "x${ac_cv_header_libintl_h}" = "xfalse" -o "x${ac_cv_header_libintl_h}" = "xno"],[
-  pandora_have_intltool=no
-])
-
-AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
-AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
-AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    AC_MSG_WARN([The intltool scripts were not found. Please install intltool.])
-    AC_MSG_WARN([On Debian: apt-get install intltool. On Redhat: yum install intltool])
-fi
-
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-
-_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-_IT_SUBST(INTLTOOL_KEYS_RULE)
-_IT_SUBST(INTLTOOL_PROP_RULE)
-_IT_SUBST(INTLTOOL_OAF_RULE)
-_IT_SUBST(INTLTOOL_PONG_RULE)
-_IT_SUBST(INTLTOOL_SERVER_RULE)
-_IT_SUBST(INTLTOOL_SHEET_RULE)
-_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-_IT_SUBST(INTLTOOL_UI_RULE)
-_IT_SUBST(INTLTOOL_XAM_RULE)
-_IT_SUBST(INTLTOOL_KBD_RULE)
-_IT_SUBST(INTLTOOL_XML_RULE)
-_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-_IT_SUBST(INTLTOOL_CAVES_RULE)
-_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-_IT_SUBST(INTLTOOL_THEME_RULE)
-_IT_SUBST(INTLTOOL_SERVICE_RULE)
-_IT_SUBST(INTLTOOL_POLICY_RULE)
-
-# Check the gettext tools to make sure they are GNU
-AC_PATH_PROG(XGETTEXT, xgettext)
-AC_PATH_PROG(MSGMERGE, msgmerge)
-AC_PATH_PROG(MSGFMT, msgfmt)
-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    AC_MSG_WARN([GNU gettext tools not found; required for intltool])
-fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    AC_MSG_WARN([GNU gettext tools not found; required for intltool])
-fi
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
-if test -z "$INTLTOOL_PERL"; then
-   AC_MSG_WARN([perl not found])
-fi
-AC_MSG_CHECKING([for perl >= 5.8.1])
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
-   AC_MSG_WARN([perl 5.8.1 is required for intltool])
-else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-   AC_MSG_RESULT([$IT_PERL_VERSION])
-fi
-if test "x$2" != "xno-xml"; then
-   AC_MSG_CHECKING([for XML::Parser])
-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       AC_MSG_RESULT([ok])
-   else
-       AC_MSG_WARN([XML::Parser perl module is required for intltool])
-   fi
-fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-AC_SUBST(ALL_LINGUAS)
-
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([[]],
-                     [[extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr]])],
-    [DATADIRNAME=share],
-    [case $host in
-    *-*-solaris*)
-    dnl On Solaris, if bind_textdomain_codeset is in libc,
-    dnl GNU format message catalog is always supported,
-    dnl since both are added to the libc all together.
-    dnl Hence, we'd like to go with DATADIRNAME=share
-    dnl in this case.
-    AC_CHECK_FUNC(bind_textdomain_codeset,
-      [DATADIRNAME=share], [DATADIRNAME=lib])
-    ;;
-    *)
-    [DATADIRNAME=lib]
-    ;;
-    esac])
-fi
-AC_SUBST(DATADIRNAME)
-
-IT_PO_SUBDIR([po])
-])
-
-
-# IT_PO_SUBDIR(DIRNAME)
-# ---------------------
-# All po subdirs have to be declared with this macro; the subdir "po" is
-# declared by IT_PROG_INTLTOOL.
-#
-AC_DEFUN([IT_PO_SUBDIR],
-[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-dnl
-dnl The following CONFIG_COMMANDS should be exetuted at the very end
-dnl of config.status.
-AC_CONFIG_COMMANDS_PRE([
-  AC_CONFIG_COMMANDS([$1/stamp-it], [
-    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
-       AC_MSG_WARN([$1/Makefile.in.in was not created by intltoolize.])
-    else
-	    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-	    >"$1/stamp-it.tmp"
-	    [sed '/^#/d
-		 s/^[[].*] *//
-		 /^[ 	]*$/d
-		'"s|^|	$ac_top_srcdir/|" \
-	      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-	    ]
-	    [sed '/^POTFILES =/,/[^\\]$/ {
-			/^POTFILES =/!d
-			r $1/POTFILES
-		  }
-		 ' "$1/Makefile.in" >"$1/Makefile"]
-	    rm -f "$1/Makefile.tmp"
-	    mv "$1/stamp-it.tmp" "$1/stamp-it"
-    fi
-  ])
-])dnl
-])
-
-# _IT_SUBST(VARIABLE)
-# -------------------
-# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-#
-AC_DEFUN([_IT_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
-
-# deprecated macros
-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-# A hint is needed for aclocal from Automake <= 1.9.4:
-# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-
diff --git a/m4/pandora_shared_ptr.m4 b/m4/pandora_shared_ptr.m4
deleted file mode 100644
index 61fdf151..00000000
--- a/m4/pandora_shared_ptr.m4
+++ /dev/null
@@ -1,59 +0,0 @@
-dnl  Copyright (C) 2009 Sun Microsystems, Inc.
-dnl This file is free software; Sun Microsystems, Inc.
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl We check two things: where is the memory include file, and in what
-dnl namespace does shared_ptr reside.
-dnl We include AC_COMPILE_IFELSE for all the combinations we've seen in the
-dnl wild:
-dnl 
-dnl  GCC 4.3: namespace: std::  #include <memory>
-dnl  GCC 4.2: namespace: tr1::  #include <tr1/memory>
-dnl  GCC 4.2: namespace: boost::  #include <boost/shared_ptr.hpp>
-dnl
-dnl We define one of HAVE_HAVE_TR1_SHARED_PTR or HAVE_BOOST_SHARED_PTR
-dnl depending on location, and SHARED_PTR_NAMESPACE to be the namespace in
-dnl which shared_ptr is defined.
-dnl 
-
-AC_DEFUN([PANDORA_SHARED_PTR],[
-  AC_REQUIRE([PANDORA_CHECK_CXX_STANDARD])
-  AC_LANG_PUSH(C++)
-  save_CXXFLAGS="${CXXFLAGS}"
-  CXXFLAGS="${CXX_STANDARD} ${CXXFLAGS}"
-  AC_CHECK_HEADERS(memory tr1/memory boost/shared_ptr.hpp)
-  AC_CACHE_CHECK([the location of shared_ptr header file],
-    [ac_cv_shared_ptr_h],[
-      for namespace in std tr1 std::tr1 boost
-      do
-        AC_COMPILE_IFELSE(
-          [AC_LANG_PROGRAM([[
-#if defined(HAVE_MEMORY)
-# include <memory>
-#endif
-#if defined(HAVE_TR1_MEMORY)
-# include <tr1/memory>
-#endif
-#if defined(HAVE_BOOST_SHARED_PTR_HPP)
-# include <boost/shared_ptr.hpp>
-#endif
-#include <string>
-
-using $namespace::shared_ptr;
-using namespace std;
-            ]],[[
-shared_ptr<string> test_ptr(new string("test string"));
-            ]])],
-            [
-              ac_cv_shared_ptr_namespace="${namespace}"
-              break
-            ],[ac_cv_shared_ptr_namespace=missing])
-       done
-  ])
-  AC_DEFINE_UNQUOTED([SHARED_PTR_NAMESPACE],
-                     ${ac_cv_shared_ptr_namespace},
-                     [The namespace in which SHARED_PTR can be found])
-  CXXFLAGS="${save_CXXFLAGS}"
-  AC_LANG_POP()
-])
diff --git a/m4/pandora_stl_hash.m4 b/m4/pandora_stl_hash.m4
deleted file mode 100644
index ef1daac7..00000000
--- a/m4/pandora_stl_hash.m4
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright (C) 2008 Sun Microsystems, Inc.
-# This file is free software; Sun Microsystems, Inc.
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# We check two things: where the include file is for unordered_map, and
-# what namespace unordered_map lives in within that include file.  We
-# include AC_COMPILE_IFELSE for all the combinations we've seen in the
-# wild.  We define HAVE_UNORDERED_MAP and HAVE_UNORDERED_SET if we have
-# them, UNORDERED_MAP_H and UNORDERED_SET_H to their location and
-# UNORDERED_NAMESPACE to be the namespace unordered_map is defined in.
-
-AC_DEFUN([PANDORA_CXX_STL_UNORDERED],[
-  save_CXXFLAGS="${CXXFLAGS}"
-  CXXFLAGS="${AM_CXXFLAGS} ${CXXFLAGS}"
-  AC_LANG_PUSH(C++)
-  AC_CACHE_CHECK([for STL unordered_map],
-    [pandora_cv_stl_unordered],[
-      AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM([[#include <unordered_map>]],
-                         [[std::unordered_map<int, int> t]])],
-        [pandora_cv_stl_unordered="yes"],
-        [pandora_cv_stl_unordered="no"])])
-
-  AS_IF([test "x${pandora_cv_stl_unordered}" != "xyes"],[
-    AC_CACHE_CHECK([for tr1 unordered_map],
-      [pandora_cv_tr1_unordered],[
-        AC_COMPILE_IFELSE(
-          [AC_LANG_PROGRAM([[
-/* We put in this define because of a YACC symbol clash in Drizzle.
-   Seriously... I cannot believe the GCC guys defined a piece of the internals
-   of this named IF - and I can't believe that YACC generates a token define
-   called IF. Really?
-*/
-#define IF 21;
-#include <tr1/unordered_map>
-            ]],[[
-std::tr1::unordered_map<int, int> t
-          ]])],
-          [pandora_cv_tr1_unordered="yes"],
-          [pandora_cv_tr1_unordered="no"])])
-  ])
-
-  AS_IF([test "x${pandora_cv_stl_unordered}" != "xyes" -a "x${pandora_cv_tr1_unordered}" != "xyes"],[
-    AC_CACHE_CHECK([for boost unordered_map],
-      [pandora_cv_boost_unordered],[
-        AC_COMPILE_IFELSE(
-          [AC_LANG_PROGRAM([[#include <boost/unordered_map.hpp>]],
-                           [[boost::unordered_map<int, int> t]])],
-          [pandora_cv_boost_unordered="yes"],
-          [pandora_cv_boost_unordered="no"])])
-  ])
-
-  CXXFLAGS="${save_CXXFLAGS}"
-  AC_LANG_POP()
-
-  AS_IF([test "x${pandora_cv_stl_unordered}" = "xyes"],[
-    AC_DEFINE(HAVE_STD_UNORDERED_MAP, 1,
-              [if the compiler has std::unordered_map])
-    AC_DEFINE(HAVE_STD_UNORDERED_SET, 1,
-              [if the compiler has std::unordered_set])
-    pandora_has_unordered=yes
-  ])
-  AS_IF([test "x${pandora_cv_tr1_unordered}" = "xyes"],[
-    AC_DEFINE(HAVE_TR1_UNORDERED_MAP, 1,
-              [if the compiler has std::tr1::unordered_map])
-    AC_DEFINE(HAVE_TR1_UNORDERED_SET, 1,
-              [if the compiler has std::tr1::unordered_set])
-    pandora_has_unordered=yes
-  ])
-  AS_IF([test "x${pandora_cv_boost_unordered}" = "xyes"],[
-    AC_DEFINE(HAVE_BOOST_UNORDERED_MAP, 1,
-              [if the compiler has boost::unordered_map])
-    AC_DEFINE(HAVE_BOOST_UNORDERED_SET, 1,
-              [if the compiler has boost::unordered_set])
-    pandora_has_unordered=yes
-  ])
-    
-  AS_IF([test "x${pandora_has_unordered}" != "xyes"],[
-    AC_MSG_WARN([could not find an STL unordered_map])
-  ])
-])
-
-AC_DEFUN([PANDORA_HAVE_CXX_UNORDERED],[
-  AC_REQUIRE([PANDORA_CXX_STL_UNORDERED])
-])
-
-AC_DEFUN([PANDORA_REQUIRE_CXX_UNORDERED],[
-  AC_REQUIRE([PANDORA_HAVE_CXX_UNORDERED])
-  AS_IF([test "x${pandora_has_unordered}" != "xyes"],[
-    AC_MSG_ERROR([An STL compliant unordered_map is required for ${PACKAGE}.
-    Implementations can be found in Recent versions of gcc and in boost])
-  ])
-])
diff --git a/m4/pandora_with_gettext.m4 b/m4/pandora_with_gettext.m4
deleted file mode 100644
index 9b13e56f..00000000
--- a/m4/pandora_with_gettext.m4
+++ /dev/null
@@ -1,44 +0,0 @@
-dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*-
-dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
-dnl   
-dnl pandora-build: A pedantic build system
-dnl Copyright (C) 2009 Sun Microsystems, Inc.
-dnl This file is free software; Sun Microsystems
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl From Monty Taylor
-
-AC_DEFUN([PANDORA_WITH_GETTEXT],[
-
-  
-  m4_syscmd([if test -d po ; then
-    echo "# This file is auto-generated from configure. Do not edit directly" > po/POTFILES.in.stamp
-    PACKAGE=$(grep ^AC_INIT configure.ac | cut -f2-3 -d[ | cut -f1 -d])
-    for f in $(find . | grep -v "${PACKAGE}-" | egrep '\.(cc|c|h|yy)$' | cut -c3- | sort)
-    do
-      if grep gettext.h "$f" | grep include >/dev/null 2>&1
-      then
-        echo "$f" >> po/POTFILES.in.stamp
-      fi
-    done
-    if diff po/POTFILES.in.stamp po/POTFILES.in >/dev/null 2>&1
-    then
-      rm po/POTFILES.in.stamp
-    else
-      mv po/POTFILES.in.stamp po/POTFILES.in
-    fi
-  fi])
-
-  m4_if(m4_substr(m4_esyscmd(test -d po && echo 0),0,1),0, [
-    AM_GNU_GETTEXT(external, need-formatstring-macros)
-    AM_GNU_GETTEXT_VERSION([0.17])
-    AS_IF([test "x$MSGMERGE" = "x" -o "x$MSGMERGE" = "x:"],[
-      AM_PATH_PROG_WITH_TEST([GMSGMERGE], gmsgmerge,
-        [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
-      MSGMERGE="${GMSGMERGE}"
-    ])
-    AM_CONDITIONAL([BUILD_GETTEXT],[test "x$MSGMERGE" != "x" -a "x$MSGMERGE" != "x:"])
-  ])
-
-])
diff --git a/m4/pandora_with_lua.m4 b/m4/pandora_with_lua.m4
deleted file mode 100644
index 322271f8..00000000
--- a/m4/pandora_with_lua.m4
+++ /dev/null
@@ -1,55 +0,0 @@
-dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*-
-dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
-dnl   
-dnl pandora-build: A pedantic build system
-dnl Copyright (C) 2009 Sun Microsystems, Inc.
-dnl This file is free software; Sun Microsystems
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl From Monty Taylor
-
-AC_DEFUN([PANDORA_WITH_LUA],[
-    dnl Check for lua
-    AC_ARG_WITH([lua], 
-    [AS_HELP_STRING([--with-lua],
-      [Build Lua Bindings @<:@default=yes@:>@])],
-    [with_lua=$withval], 
-    [with_lua=yes])
-
-  AS_IF([test "x$with_lua" != "xno"],[
-    AS_IF([test "x$with_lua" = "xyes"],
-      [LUAPC=lua],
-      [LUAPC=$with_lua])
-
-    PKG_CHECK_MODULES([LUA], $LUAPC >= 5.1, [
-      AC_DEFINE([HAVE_LUA], [1], [liblua])
-      AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-      with_lua=yes
-    ],[
-      LUAPC=lua5.1
-      PKG_CHECK_MODULES([LUA], $LUAPC >= 5.1, [
-        AC_DEFINE([HAVE_LUA], [1], [liblua])
-        AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-        with_lua=yes
-      ],[
-        AC_DEFINE([HAVE_LUA],["x"],["x"])
-        with_lua=no
-      ])
-    ])
-
-    AC_CACHE_CHECK([for LUA installation location],[pandora_cv_lua_archdir],[
-      AS_IF([test "$prefix" = "NONE"],[
-        pandora_cv_lua_archdir=`${PKG_CONFIG} --define-variable=prefix=${ac_default_prefix} --variable=INSTALL_CMOD ${LUAPC}`
-      ],[
-        pandora_cv_lua_archdir=`${PKG_CONFIG} --define-variable=prefix=${prefix} --variable=INSTALL_CMOD ${LUAPC}`
-      ])
-    ])
-    LUA_ARCHDIR="${pandora_cv_lua_archdir}"
-    AC_SUBST(LUA_ARCHDIR)
-    AC_SUBST(LUA_CFLAGS)
-    AC_SUBST(LUA_LIBS)
-  ])
-  AM_CONDITIONAL(BUILD_LUA, test "$with_lua" = "yes")
-
-])
diff --git a/m4/pandora_with_perl.m4 b/m4/pandora_with_perl.m4
deleted file mode 100644
index 5c1fa1cf..00000000
--- a/m4/pandora_with_perl.m4
+++ /dev/null
@@ -1,81 +0,0 @@
-dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*-
-dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
-dnl   
-dnl pandora-build: A pedantic build system
-dnl Copyright (C) 2009 Sun Microsystems, Inc.
-dnl This file is free software; Sun Microsystems
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl From Monty Taylor
-
-
-AC_DEFUN([PANDORA_WITH_PERL], [
-
-  AC_ARG_WITH([perl], 
-    [AS_HELP_STRING([--with-perl],
-      [Build Perl Bindings @<:@default=yes@:>@])],
-    [with_perl=$withval], 
-    [with_perl=yes])
-
-  AC_ARG_WITH([perl-arch],
-    [AS_HELP_STRING([--with-perl-arch],
-      [Install Perl bindings into system location @<:@default=no@:>@])],
-    [with_perl_arch=$withval],
-    [with_perl_arch=no])
-
-  AS_IF([test "x$with_perl" != "xno"],[
-    AS_IF([test "x$with_perl" != "xyes"],
-      [ac_chk_perl=$with_perl],
-      [ac_chk_perl=perl])
-    AC_CHECK_PROGS(PERL,$ac_chk_perl)
-  ])
-  AS_IF([test "x$PERL" != "x"],[
-    AC_CACHE_CHECK([for Perl include path],[pandora_cv_perl_include],[
-      pandora_cv_perl_include=`$PERL -MConfig -e 'print $Config{archlib};'`
-      pandora_cv_perl_include="${pandora_cv_perl_include}/CORE"
-    ])
-    AC_CACHE_CHECK([for Perl CPPFLAGS],[pandora_cv_perl_cppflags],[
-      pandora_cv_perl_cppflags=`$PERL -MConfig -e 'print $Config{cppflags};'`
-      pandora_cv_perl_cppflags="${pandora_cv_perl_cppflags}"
-    ])
-    PERL_CPPFLAGS="-I${pandora_cv_perl_include} ${pandora_cv_perl_cppflags}"
-
-    AC_CACHE_CHECK([for Perl development headers],
-      [pandora_cv_perl_dev],[
-        
-        save_CPPFLAGS="${CPPFLAGS}"
-        CPPFLAGS="${CPPFLAGS} ${PERL_CPPFLAGS}"
-        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <math.h>
-#include <stdlib.h>
-#include "EXTERN.h"
-#include "perl.h"
-#include "XSUB.h"
-        ]])],
-        [pandora_cv_perl_dev=yes],
-        [pandora_cv_perl_dev=no])
-        CPPFLAGS="${save_CPPFLAGS}"
-      ])
-
-    AS_IF([test "${pandora_cv_perl_dev}" = "no"],
-      [with_perl=no])
-
-    AC_CACHE_CHECK([for Perl install location],
-      [pandora_cv_perl_archdir],[
-        AS_IF([test "${with_perl_arch}" = "no"],[
-          pandora_cv_perl_archdir=`$PERL -MConfig -e 'print $Config{sitearch}'`
-        ],[
-          pandora_cv_perl_archdir=`$PERL -MConfig -e 'print $Config{archlib}'`
-        ])
-        pandora_cv_perl_archdir="${pandora_cv_perl_archdir}"
-    ])
- 
-    PERL_ARCHDIR="${pandora_cv_perl_archdir}"
-  ])
-  AC_SUBST([PERL_CPPFLAGS])
-  AC_SUBST([PERL_ARCHDIR])
-
-  AM_CONDITIONAL(BUILD_PERL, [test "$with_perl" != "no"])
-
-])
diff --git a/m4/pandora_with_php.m4 b/m4/pandora_with_php.m4
deleted file mode 100644
index 070b00db..00000000
--- a/m4/pandora_with_php.m4
+++ /dev/null
@@ -1,56 +0,0 @@
-dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*-
-dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
-dnl   
-dnl pandora-build: A pedantic build system
-dnl Copyright (C) 2009 Sun Microsystems, Inc.
-dnl This file is free software; Sun Microsystems
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl From Monty Taylor
-
-
-AC_DEFUN([PANDORA_WITH_PHP],[
-
-  AC_ARG_WITH([php],
-    [AS_HELP_STRING([--with-php],
-      [Build NDB/PHP @<:@default=no@:>@])],
-    [with_php=$withval],
-    [with_php=no])
-
-  AS_IF([test "x$with_php" != "xno"],[
-    dnl We explicitly requested PHP build. Fail on too-young SWIG.
-    AS_IF([test "x$SWIG_CAN_BUILD_PHP" != "xyes"],
-      [AC_MSG_ERROR("Your version of SWIG is too young to build NDB/PHP. >=1.3.33 is required!")])
-    AS_IF([test "x$with_php" != "xyes"],
-      [ac_check_php_config=$with_php],
-      [ac_check_php_config="php-config php-config5"])
-      AC_CHECK_PROGS(PHP_CONFIG, [$ac_check_php_config])
-    ])
-
-  AS_IF([test "x$PHP_CONFIG" != "x"],[
-    PHP_CFLAGS=`$PHP_CONFIG --includes`
-    PHP_CPPFLAGS=`$PHP_CONFIG --includes`
-    PHP_LDFLAGS=`$PHP_CONFIG --ldflags`
-    PHP_EXTDIR=`$PHP_CONFIG --extension-dir`
-    strip_php_prefix=`$PHP_CONFIG --prefix | sed 's/\//./g'`
-    PHP_ARCH_DIR=`echo $PHP_EXTDIR | sed "s/$strip_php_prefix//"`
-  ],[
-    PHP_CFLAGS=
-    PHP_CPPFLAGS=
-    PHP_LDFLAGS=
-    PHP_EXTDIR=
-    PHP_ARCH_DIR=
-    with_php=no
-  ])
-
-  AC_SUBST(PHP_CFLAGS)
-  AC_SUBST(PHP_CPPFLAGS)
-  AC_SUBST(PHP_LDFLAGS)
-  AC_SUBST(PHP_EXTDIR)
-  AC_SUBST(PHP_ARCH_DIR)
-
-  AM_CONDITIONAL(BUILD_PHP, test "$with_php" = "yes")
-  
-])
-
diff --git a/m4/pandora_with_python3.m4 b/m4/pandora_with_python3.m4
deleted file mode 100644
index 0119ed94..00000000
--- a/m4/pandora_with_python3.m4
+++ /dev/null
@@ -1,44 +0,0 @@
-dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*-
-dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
-dnl   
-dnl pandora-build: A pedantic build system
-dnl Copyright (C) 2009 Sun Microsystems, Inc.
-dnl This file is free software; Sun Microsystems
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl From Monty Taylor
-
-AC_DEFUN([PANDORA_WITH_PYTHON3], [
-
-  AC_REQUIRE([PANDORA_SWIG])
-
-  AC_ARG_WITH([python3], 
-    [AS_HELP_STRING([--with-python3],
-      [Build Python3 Bindings @<:@default=yes@:>@])],[
-        with_python3=$withval
-        python3_requested=$withval
-      ],[ 
-        with_python3=yes
-        python3_requested=no
-      ])
-
-  AS_IF([test "x$ac_cv_swig_has_python3_" != "xyes"],[
-     with_python3=no
-  ],[
-   AS_IF([test "x$with_python3" != "xno"],[
-     AS_IF([test "x$with_python3" != "xyes"],
-       [PYTHON3=$with_python3],[
-        AC_PATH_PROG([PYTHON3],[python3],[no])
-        PANDORA_PYTHON3_DEVEL()
-        AS_IF([test "x$python3exists" = "xno"],[with_python="no"])
-     ]) 
-   ])
-  ])
-  AS_IF([test "x$with_python3" = "xno" -a "$python3_requested" = "yes"],[
-    AC_MSG_ERROR([Python3 support was explicity requested, but Python3 support
-                  was not found. Please correct your build environment and try
-                  again])
-  ])
-  AM_CONDITIONAL(BUILD_PYTHON3, [test "$with_python3" = "yes"])
-])
diff --git a/m4/pandora_with_r.m4 b/m4/pandora_with_r.m4
deleted file mode 100644
index 843b201b..00000000
--- a/m4/pandora_with_r.m4
+++ /dev/null
@@ -1,33 +0,0 @@
-dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*-
-dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
-dnl   
-dnl pandora-build: A pedantic build system
-dnl Copyright (C) 2009 Sun Microsystems, Inc.
-dnl This file is free software; Sun Microsystems
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl From Monty Taylor
-
-AC_DEFUN([PANDORA_WITH_R],[
-    dnl Check for GNU R
-    AC_ARG_WITH([r], 
-    [AS_HELP_STRING([--with-r],
-      [Build R Bindings @<:@default=yes@:>@])],
-    [with_r=$withval], 
-    [with_r=yes])
-
-  AS_IF([test "x$with_r" != "xno"],[
-
-    PKG_CHECK_MODULES([R], [libR], [
-      with_r=yes
-    ],[
-      with_r=no
-    ])
-
-   AC_SUBST(R_CFLAGS)
-   AC_SUBST(R_LIBS)
-  ])
-  AM_CONDITIONAL(BUILD_R, test "$with_r" = "yes")
-
-])
diff --git a/m4/pandora_with_ruby.m4 b/m4/pandora_with_ruby.m4
deleted file mode 100644
index 2d09e9b1..00000000
--- a/m4/pandora_with_ruby.m4
+++ /dev/null
@@ -1,79 +0,0 @@
-dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*-
-dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
-dnl   
-dnl pandora-build: A pedantic build system
-dnl Copyright (C) 2009 Sun Microsystems, Inc.
-dnl This file is free software; Sun Microsystems
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl From Monty Taylor
-
-
-AC_DEFUN([PANDORA_WITH_RUBY], [
-
-  AC_ARG_WITH([ruby],
-    [AS_HELP_STRING([--with-ruby],
-      [Build Ruby Bindings @<:@default=yes@:>@])],
-      [with_ruby=$withval],
-      [with_ruby=ruby])
-
-  AS_IF([test "x$with_ruby" != "xno"],[
-    AS_IF([test "x$with_ruby" != "xyes"],
-      [ac_chk_ruby=$with_ruby],
-      [ac_chk_ruby=ruby1.8 ruby])
-    AC_CHECK_PROGS(RUBY,$ac_chk_ruby)
-  ])
-
-  AS_IF([test "x$RUBY" != "x"],[
-
-    AC_MSG_CHECKING(for ruby devel)
-
-    dnl need to change quotes to allow square brackets
-    changequote(<<, >>)dnl
-    ruby_prefix=`$RUBY -rrbconfig -e "print Config::CONFIG['archdir']"`
-    strip_ruby_prefix=`$RUBY -rrbconfig -e "print Config::CONFIG['prefix']" | sed 's/\//./g'`
-    
-    RUBY_LIB=`$RUBY -rrbconfig -e "puts Config::CONFIG['ruby_install_name']"`
-    LIBRUBYARG_SHARED=`$RUBY -rrbconfig -e "puts Config::CONFIG['LIBRUBYARG_SHARED']"`
-    RUBY_DIR=`$RUBY -rrbconfig -e "puts Config::CONFIG['archdir']"`
-    RUBY_ARCH_DIR=`echo $RUBY_DIR | sed "s/$strip_ruby_prefix//"`
-    RUBY_LIBDIR=`$RUBY -rrbconfig -e "puts Config::CONFIG['rubylibdir']"`
-    RUBY_INCLUDES="-I$ruby_prefix"
-    changequote([, ])dnl
-
-    ac_save_CFLAGS="$CFLAGS"
-    ac_save_CPPFLAGS="$CPPFLAGS"
-    ac_save_LDFLAGS="$LDFLAGS"
-    CFLAGS="$ac_save_CFLAGS $RUBY_INCLUDES"
-    CPPFLAGS="$ac_save_CPPFLAGS $RUBY_INCLUDES"
-    LDFLAGS="$ac_save_LDFLAGS $LIBRUBYARG_SHARED"
-    
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ruby.h>]], [[VALUE rb_ac_test = rb_define_module("actest");]])],[with_ruby="yes";AC_MSG_RESULT(found)],[with_ruby="no";AC_MSG_RESULT(missing)])
-
-    CPPFLAGS="$ac_save_CPPFLAGS"
-    CFLAGS="$ac_save_CFLAGS"
-    LDFLAGS="$ac_save_LDFLAGS"
-  ],[
-    # This allows 'make clean' in the ruby directory to work when
-    # ruby isn't available
-    RUBY=
-    RUBY_INCLUDES=
-    LIBRUBYARG_SHARED=
-    RUBY_LIB=
-    RUBY_DIR=
-    RUBY_LIBDIR=
-    RUBY_ARCH_DIR=
-    with_ruby="no"
-  ])
-
-  AC_SUBST(RUBY_INCLUDES)
-  AC_SUBST(LIBRUBYARG_SHARED)
-  AC_SUBST(RUBY_LIB)
-  AC_SUBST(RUBY_DIR)
-  AC_SUBST(RUBY_LIBDIR)
-  AC_SUBST(RUBY_ARCH_DIR)
-
-  AS_IF([test "x$RUBY_DIR" = "x"],[with_ruby="no"])
-  AM_CONDITIONAL(BUILD_RUBY, test "$with_ruby" = "yes")
-])
diff --git a/m4/pandora_with_valgrind.m4 b/m4/pandora_with_valgrind.m4
deleted file mode 100644
index 47944d8b..00000000
--- a/m4/pandora_with_valgrind.m4
+++ /dev/null
@@ -1,17 +0,0 @@
-dnl  Copyright (C) 2010 Brian Aker
-dnl This file is free software; Brian Aker
-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_WITH_VALGRIND],[
-
-  AC_ARG_WITH([valgrind],
-    [AS_HELP_STRING([--with-valgrind],
-       [Add additional valgrind code for testing with valgrind.])],
-    [with_valgrind=yes],
-    [with_valgrind=no])
-  AM_CONDITIONAL(HAVE_VALGRIND,[test "x${with_valgrind}" = "xyes"])
-  AS_IF([test "x$with_valgrind" = "xyes"],
-        AC_DEFINE([HAVE_VALGRIND],[1],
-                  [Add additional valgrind code for testing with valgrind.]))
-])