Merge lp:~mordred/gearmand/update-build into lp:gearmand/1.0

[Monty Taylor]

Updated the pandora-build stuff. This should properly die on too old libmemcached, find new libdrizzle and fix the various c++ warnings.

=== added file '.quickly'
--- .quickly	1970-01-01 00:00:00 +0000
+++ .quickly	2011-04-16 05:39:23 +0000
@@ -0,0 +1,5 @@
+project = gearmand
+version = 0.4.2
+template = pandora-build
+project-type = application
+pandora-version = 0.176

=== modified file 'bin/arguments.cc'
--- bin/arguments.cc	2011-04-13 04:12:34 +0000
+++ bin/arguments.cc	2011-04-16 05:39:23 +0000
@@ -26,6 +26,7 @@
 {
 
 Args::Args(int p_argc, char *p_argv[]) :
+  _functions(),
   _host(NULL),
   _port(0),
   _count(0),
@@ -41,7 +42,8 @@
   _priority(GEARMAN_JOB_PRIORITY_NORMAL),
   _timeout(-1),
   argv(p_argv),
-  _error(0)
+  _error(0),
+  _pid_file("")
 {
   init(p_argc);
 }

=== modified file 'bin/arguments.h'
--- bin/arguments.h	2011-03-03 07:48:59 +0000
+++ bin/arguments.h	2011-04-16 05:39:23 +0000
@@ -162,6 +162,9 @@
   {
     _functions.push_back(Function(name));
   }
+
+  Args(const Args&);
+  Args& operator=(const Args&);
 };
 
 } // namespace gearman_client

=== modified file 'bin/client.h'
--- bin/client.h	2011-03-08 20:32:44 +0000
+++ bin/client.h	2011-04-16 05:39:23 +0000
@@ -40,7 +40,8 @@
 class Client
 {
 public:
-  Client()
+  Client() :
+    _client()
   {
     if (gearman_client_create(&_client) == NULL)
     {

=== modified file 'bin/function.cc'
--- bin/function.cc	2011-03-03 07:48:59 +0000
+++ bin/function.cc	2011-04-16 05:39:23 +0000
@@ -14,10 +14,11 @@
 
 namespace gearman_client
 {
-Function::Function(const char *name_arg)
+Function::Function(const char *name_arg) :
+  _name(),
+  _task(),
+  _buffer()
 {
-  memset(&_task, 0, sizeof(gearman_task_st));
-
   // copy the name into the _name vector
   size_t length= strlen(name_arg);
   _name.resize(length +1);

=== modified file 'bin/worker.h'
--- bin/worker.h	2011-03-08 20:32:44 +0000
+++ bin/worker.h	2011-04-16 05:39:23 +0000
@@ -40,7 +40,8 @@
 class Worker
 {
 public:
-  Worker()
+  Worker() :
+    _worker()
   {
     if (gearman_worker_create(&_worker) == NULL)
     {

=== modified file 'config/autorun.sh'
--- config/autorun.sh	2009-12-18 18:02:39 +0000
+++ config/autorun.sh	2011-04-16 05:39:23 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
-#  Copyright (c) 2006 Jan Kneschke
-#  Copyright (c) 2009 Sun Microsystems
+#  Copyright (C) 2006 Jan Kneschke
+#  Copyright (C) 2009 Sun Microsystems, Inc.
 #  All rights reserved.
 # 
 #  Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,7 @@
 LIBTOOLIZE_FLAGS=" --automake --copy --force"
 # --add-missing instructs automake to install missing auxiliary files
 # and --force to overwrite them if they already exist
-AUTOMAKE_FLAGS="--add-missing --copy --force"
+AUTOMAKE_FLAGS="--add-missing --copy --force --foreign"
 ACLOCAL_FLAGS="-I m4"
 
 ARGV0=$0

=== added file 'config/lcov.am'
--- config/lcov.am	1970-01-01 00:00:00 +0000
+++ config/lcov.am	2011-04-16 05:39:23 +0000
@@ -0,0 +1,42 @@
+#  Copyright (C) 2010 Hartmut Holzgraefe
+#
+#  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; version 2 of the License.
+#
+#  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 St, Fifth Floor, Boston, MA  02110-1301  USA
+
+LCOV = lcov
+LCOV_GENHTML = genhtml
+
+lcov: lcov-html
+
+lcov-test: lcov-clean-data test
+
+drizzle_lcov.info: lcov-test
+	@echo "Generating $@"
+	$(LCOV) --directory . --capture --base-directory . --output-file $@
+	$(LCOV) --remove $@ '/usr/include/*' --output-file $@
+	$(LCOV) --remove $@ '/usr/local/include/*' --output-file $@
+	@echo
+
+lcov-html: drizzle_lcov.info
+	@echo "Generating lcov HTML"
+	@$(LCOV_GENHTML) --legend --output-directory lcov_html/ --title "Drizzle Code Coverage" $<
+
+lcov-clean:
+	rm -f drizzle_lcov.info
+	rm -rf lcov_data/
+	rm -rf lcov_html/
+
+lcov-clean-data:
+	@find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f
+
+

=== added file 'config/pandora-plugin'
--- config/pandora-plugin	1970-01-01 00:00:00 +0000
+++ config/pandora-plugin	2011-04-16 05:39:23 +0000
@@ -0,0 +1,752 @@
+#!/usr/bin/python
+
+#  Copyright (C) 2009 Sun Microsystems, Inc.
+#  Copyright (C) 2010, 2011 Monty Taylor
+#
+#  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; version 2 of the License.
+#
+#  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 St, Fifth Floor, Boston, MA  02110-1301  USA
+
+pandora_plugin_file = 'config/pandora-plugin.ini'
+
+# Find plugins in the tree and add them to the build system
+
+import ConfigParser, os, sys
+import datetime, time
+import subprocess
+
+plugin_am_file=None
+plugin_ac_file=None
+plugin_doc_index=None
+
+class ChangeProtectedFile(object):
+
+  def __init__(self, fname):
+    self.bogus_file= False
+    self.real_fname= fname
+    self.new_fname= "%s.new" % fname
+    try:
+      self.new_file= open(self.new_fname,'w+')
+    except IOError:
+      self.bogus_file= True
+
+  def write(self, text):
+    if not self.bogus_file:
+      self.new_file.write(text)
+
+  # We've written all of this out into .new files, now we only copy them
+  # over the old ones if they are different, so that we don't cause
+  # unnecessary recompiles
+  def close(self):
+    """Return True if the file had changed."""
+    if self.bogus_file:
+      return
+    self.new_file.seek(0)
+    new_content = self.new_file.read()
+    self.new_file.close()
+    try:
+        old_file = file(self.real_fname, 'r')
+        old_content = old_file.read()
+        old_file.close()
+    except IOError:
+        old_content = None
+    if new_content != old_content:
+      if old_content != None:
+        os.unlink(self.real_fname)
+      os.rename(self.new_fname, self.real_fname)
+      return True
+    else:
+        try:
+          os.unlink(self.new_fname)
+        except:
+          pass
+
+
+def write_external_configure(plugin, plugin_file):
+  """Write the initial bits of the configure.ac file"""
+  if not os.path.exists('m4'):
+    os.mkdir('m4')
+  plugin_file.write("""
+AC_PREREQ(2.59)dnl		Minimum Autoconf version required.
+AC_INIT([%(name)s],[%(version)s],[%(url)s])
+AC_CONFIG_SRCDIR([%(main_source)s])
+AC_CONFIG_AUX_DIR(config)
+
+PANDORA_CANONICAL_TARGET(less-warnings, warnings-always-on, require-cxx, force-gcc42,skip-visibility)
+
+PANDORA_REQUIRE_LIBPROTOBUF
+PANDORA_PROTOBUF_REQUIRE_VERSION([2.1.0])
+PANDORA_REQUIRE_PROTOC
+
+AC_LANG_PUSH(C++)
+PANDORA_REQUIRE_PTHREAD
+PANDORA_REQUIRE_LIBDL
+AC_LANG_POP
+
+PANDORA_USE_BETTER_MALLOC
+
+PANDORA_DRIZZLE_BUILD
+""" % plugin)
+
+  write_plugin_ac(plugin, plugin_file)
+
+  plugin_file.write("""
+AC_CONFIG_FILES(Makefile)
+
+AC_OUTPUT
+
+echo "---"
+echo "Configuration summary for $PACKAGE_NAME version $VERSION $PANDORA_RELEASE_COMMENT"
+echo ""
+echo "   * Installation prefix:       $prefix"
+echo "   * System type:               $host_vendor-$host_os"
+echo "   * Host CPU:                  $host_cpu"
+echo "   * C Compiler:                $CC_VERSION"
+echo "   * C++ Compiler:              $CXX_VERSION"
+echo "   * Debug enabled:             $with_debug"
+echo "   * Warnings as failure:       $ac_cv_warnings_as_errors"
+echo "   * C++ cstdint location:      $ac_cv_cxx_cstdint"
+echo "   * C++ hash_map location:     $ac_cv_cxx_hash_map"
+echo "   * C++ hash namespace:        $ac_cv_cxx_hash_namespace"
+echo "   * C++ shared_ptr namespace:  $ac_cv_shared_ptr_namespace"
+echo ""
+echo "---"
+
+  """ % plugin)
+
+def write_external_makefile(plugin, plugin_file):
+
+  plugin_file.write("""
+ACLOCAL_AMFLAGS = -I m4 --force
+VERSION=$(PANDORA_RELEASE_VERSION)
+
+pkgplugindir=%(pkgplugindir)s
+EXTRA_DIST = plugin.ini
+
+noinst_HEADERS=
+nobase_include_HEADERS=
+nobase_pkginclude_HEADERS=
+check_PROGRAMS=
+noinst_LTLIBRARIES=
+bin_PROGRAMS=
+
+
+""" % plugin)
+  if plugin['headers'] != "":
+    plugin_file.write("noinst_HEADERS += %(headers)s\n" % plugin)
+  if plugin['install_headers'] != "":
+    plugin_file.write("nobase_pkginclude_HEADERS += %(install_headers)s\n" % plugin)
+  if plugin['testsuite']:
+    if plugin.has_key('testsuitedir') and plugin['testsuitedir'] != "":
+      plugin_file.write("EXTRA_DIST += %(testsuitedir)s\n" % plugin)
+  plugin_file.write("""
+pkgplugin_LTLIBRARIES=%(libname)s.la
+%(libname)s_la_LDFLAGS=-avoid-version -rpath $(pkgplugindir) $(AM_LDFLAGS) %(ldflags)s $(GCOV_LIBS)
+%(libname)s_la_LIBADD=%(libs)s
+%(libname)s_la_DEPENDENCIES=%(libs)s
+%(libname)s_la_CPPFLAGS=$(AM_CPPFLAGS) -DPANDORA_DYNAMIC_PLUGIN -DPANDORA_MODULE_NAME=%(module_name)s -DPANDORA_MODULE_AUTHOR='%(author)s' -DPANDORA_MODULE_TITLE='%(title)s' -DPANDORA_MODULE_VERSION='%(version)s' -DPANDORA_MODULE_LICENSE=%(license)s %(cppflags)s
+%(libname)s_la_CXXFLAGS=$(AM_CXXFLAGS) %(cxxflags)s
+%(libname)s_la_CFLAGS=$(AM_CFLAGS) %(cflags)s
+%(libname)s_la_SOURCES=%(sources)s
+check_PROGRAMS += %(tests)s
+""" % plugin)
+  plugin_am_file=os.path.join(plugin['rel_path'],'plugin.am')
+  if os.path.exists(plugin_am_file):
+    plugin_file.write('include %s\n' % plugin_am_file)
+
+def write_external_plugin():
+  """Return True if the plugin had changed."""
+  plugin = read_plugin_ini('.')
+  expand_plugin_ini(plugin)
+  plugin_file = ChangeProtectedFile('configure.ac')
+  write_external_configure(plugin, plugin_file)
+  result = plugin_file.close()
+  plugin_file = ChangeProtectedFile('Makefile.am')
+  write_external_makefile(plugin, plugin_file)
+  # Write some stub configure.ac and Makefile.am files that include the above
+  result = plugin_file.close() or result
+  return result
+
+def write_plugin(plugin, plugin_ini_list):
+  # Since this function is recursive, make sure we're not already in it.
+  if plugin.has_key('writing_status'):
+    if plugin['writing_status'] == 'done':
+      return
+    else:
+      print "Dependency loop detected with %s" % plugin['name']
+      exit(1)
+
+  plugin['writing_status'] = 'dependencies'
+
+  # Write all dependencies first to get around annoying automake bug
+  for dependency in plugin['dependency_list']:
+    found = False
+    for find_plugin in plugin_ini_list:
+      if find_plugin['module_name'] == dependency:
+        found = True
+        write_plugin(find_plugin, plugin_ini_list)
+        break
+    if found is False:
+      print "Could not find dependency %s: %s" % (plugin['name'], dependency)
+      exit(1)
+
+  write_plugin_ac(plugin, plugin_ac_file)
+  write_plugin_am(plugin, plugin_am_file)
+  write_plugin_docs(plugin, plugin_doc_index, plugin_am_file)
+  plugin['writing_status'] = 'done'
+
+def write_plugin_docs(plugin, doc_index, plugin_am):
+  if plugin['docs'] is not None and os.path.isdir("docs/plugins"):
+    if not os.path.exists(os.path.join("docs/plugins",plugin["name"])):
+      os.symlink(os.path.abspath(plugin["docs"]), os.path.join("docs/plugins",plugin["name"]))
+    doc_index.write("""
+   %(name)s/index""" % plugin)
+    plugin_am.write("""
+EXTRA_DIST+=${top_srcdir}/docs/plugins/%(name)s/*.rst
+""" % plugin)
+
+def write_plugin_ac(plugin, plugin_ac):
+  #
+  # Write plugin config instructions into plugin.ac file.
+  #
+  plugin_ac_file=os.path.join(plugin['rel_path'],'plugin.ac')
+  plugin_m4_dir=os.path.join(plugin['rel_path'],'m4')
+  plugin_m4_files=[]
+  if os.path.exists(plugin_m4_dir) and os.path.isdir(plugin_m4_dir):
+    for m4_file in os.listdir(plugin_m4_dir):
+      if os.path.splitext(m4_file)[-1] == '.m4':
+        plugin_m4_files.append(os.path.join(plugin['rel_path'], m4_file))
+  plugin_ac.write("""
+dnl Config for %(title)s
+""" % plugin)
+  for m4_file in plugin_m4_files:
+    plugin_ac.write('m4_sinclude([%s])\n' % m4_file)
+  plugin['plugin_dep_libs']=" ".join(["\${top_builddir}/%s" % f for f in plugin['libs'].split()])
+
+  plugin_ac.write("""
+AC_ARG_WITH([%(name_with_dashes)s-plugin],[
+dnl indented wierd to make the help output correct
+AS_HELP_STRING([--with-%(name_with_dashes)s-plugin],[Build %(title)s. @<:@default=%(enabled)s@:>@])
+AS_HELP_STRING([--without-%(name_with_dashes)s-plugin],[Disable building %(title)s])
+  ],[
+    with_%(name)s_plugin="$withval"
+    AS_IF([test "x$with_%(name)s_plugin" = "xyes"],[
+      requested_%(name)s_plugin="yes"
+    ],[
+      requested_%(name)s_plugin="no"
+    ])
+  ],[
+    with_%(name)s_plugin="%(enabled)s"
+    requested_%(name)s_plugin="no"
+  ])
+AC_ARG_WITH([static-%(name_with_dashes)s-plugin],[
+AS_HELP_STRING([--with-static-%(name_with_dashes)s-plugin],[Build Archive Storage Engine. @<:@default=%(static_yesno)s@:>@])
+AS_HELP_STRING([--without-static-%(name_with_dashes)s-plugin],[Disable building Archive Storage Engine])
+  ],[
+    with_static_%(name)s_plugin=${withval}
+  ],[
+    with_static_%(name)s_plugin=%(static_yesno)s
+])
+AS_IF([test "x${with_static_%(name)s_plugin}" = "xyes" -o "x${with_all_static}" = "xyes"],[
+  shared_%(name)s_plugin=no
+  ],[
+  shared_%(name)s_plugin=yes
+])
+AC_ARG_ENABLE([%(name_with_dashes)s-plugin],[
+dnl indented wierd to make the help output correct
+AS_HELP_STRING([--enable-%(name_with_dashes)s-plugin],[Enable loading %(title)s by default. @<:@default=%(default_yesno)s@:>@])
+AS_HELP_STRING([--disable-%(name_with_dashes)s-plugin],[Disable loading %(title)s by default.])
+  ],
+  [enable_%(name)s_plugin="$enableval"],
+  [enable_%(name)s_plugin=%(default_yesno)s])
+
+""" % plugin)
+  if os.path.exists(plugin_ac_file):
+    plugin_ac.write('m4_sinclude([%s])\n' % plugin_ac_file)
+  # The plugin author has specified some check to make to determine
+  # if the plugin can be built. If the plugin is turned on and this
+  # check fails, then configure should error out. If the plugin is not
+  # turned on, then the normal conditional build stuff should just let
+  # it silently not build
+  if plugin['has_build_conditional']:
+    plugin_ac.write("""
+AS_IF([test %(build_conditional)s],
+      [], dnl build_conditional can only negate
+      [
+        AS_IF([test "x${requested_%(name)s_plugin}" = "xyes"],
+              [AC_MSG_ERROR([Plugin %(name)s was explicitly requested, yet failed build dependency checks. Aborting!])])
+        with_%(name)s_plugin=no
+      ])
+
+""" % plugin)
+  if not plugin['unconditional']:
+    plugin_ac.write("""
+AM_CONDITIONAL([%(static_build_conditional_tag)s],
+               [test %(build_conditional)s -a ! %(shared_build)s])
+AM_CONDITIONAL([%(shared_build_conditional_tag)s],
+               [test %(build_conditional)s -a %(shared_build)s])
+AM_CONDITIONAL([%(build_conditional_tag)s],
+               [test %(build_conditional)s])
+    """ % plugin)
+
+  plugin_ac.write("""
+AS_IF([test "x$with_%(name)s_plugin" = "xyes"],[
+""" % plugin)
+  if plugin['testsuite']:
+    plugin_ac.write("""
+      pandora_plugin_test_list="%(name)s,${pandora_plugin_test_list}"
+    """ % plugin)
+  plugin_ac.write("""
+      AS_IF([test "x${with_static_%(name)s_plugin}" = "xyes" -o "x${with_all_static}" = "xyes"],[
+
+        AS_IF([test "x$enable_%(name)s_plugin" = "xyes"],[
+          pandora_builtin_load_list="%(module_name)s,${pandora_builtin_load_list}"
+          pandora_builtin_load_symbols_list="_drizzled_%(module_name)s_plugin_,${pandora_builtin_load_symbols_list}"
+          PANDORA_PLUGIN_DEP_LIBS="${PANDORA_PLUGIN_DEP_LIBS} %(plugin_dep_libs)s"
+        ])
+        pandora_builtin_list="%(module_name)s,${pandora_builtin_list}"
+        pandora_builtin_symbols_list="_drizzled_%(module_name)s_plugin_,${pandora_builtin_symbols_list}"
+        pandora_plugin_libs="${pandora_plugin_libs} \${top_builddir}/%(root_plugin_dir)s/%(libname)s.la"
+     ],[
+        AS_IF([test "x$enable_%(name)s_plugin" = "xyes"],[
+          pandora_default_plugin_list="%(name)s,${pandora_default_plugin_list}"
+        ])
+    ])
+    """ % plugin)
+  plugin_ac.write("])\n")
+
+def fix_file_paths(plugin, files):
+  # TODO: determine path to plugin dir relative to top_srcdir... append it to
+  # source files if they don't already have it
+  new_files=""
+  if plugin['plugin_dir'] != ".":
+    for file in files.split():
+      if not file.startswith(plugin['rel_path']):
+        file= os.path.join(plugin['rel_path'], file)
+        new_files= "%s %s" % (new_files, file)
+  else:
+    new_files= " ".join(plugin['sources'].split())
+  if new_files != "":
+    return new_files
+  return files
+
+def expand_plugin_ini(plugin):
+    if plugin['name'] == "**OUT-OF-TREE**":
+      print "Out of tree plugins require the name field to be specified in plugin.ini"
+      sys.exit(1)
+
+    if plugin['plugin_dir'] == ".":
+      plugin['rel_path']= plugin['plugin_dir']
+      plugin['unconditional']=True
+    else:
+      plugin['rel_path']= plugin['plugin_dir'][len(config['top_srcdir'])+len(os.path.sep):]
+      plugin['unconditional']=False
+
+    plugin['sources']= fix_file_paths(plugin, plugin['sources'])
+    plugin['main_source']= plugin['sources'].split()[0]
+    plugin['headers']= fix_file_paths(plugin, plugin['headers'])
+    plugin['install_headers']= fix_file_paths(plugin, plugin['install_headers'])
+    plugin['tests']= fix_file_paths(plugin, plugin['tests'])
+
+    # Make a yes/no version for autoconf help messages
+    if plugin['load_by_default']:
+      plugin['default_yesno']="yes"
+    else:
+      plugin['default_yesno']="no"
+
+    if plugin.has_key('extra_dist'):
+      plugin['extra_dist']=" ".join([os.path.join(plugin['rel_path'],f) for f in plugin['extra_dist'].split()])
+
+
+    if plugin['static']:
+      plugin['static_yesno']="yes"
+    else:
+      plugin['static_yesno']="no"
+    plugin['build_conditional_tag']= "BUILD_%s_PLUGIN" % plugin['name'].upper()
+    plugin['shared_build_conditional_tag']= "BUILD_%s_PLUGIN_SHARED" % plugin['name'].upper()
+    plugin['static_build_conditional_tag']= "BUILD_%s_PLUGIN_STATIC" % plugin['name'].upper()
+    plugin['name_with_dashes']= plugin['name'].replace('_','-')
+    if plugin.has_key('build_conditional'):
+      plugin['has_build_conditional']=True
+      plugin['build_conditional']='"x${with_%(name)s_plugin}" = "xyes" -a %(build_conditional)s' % plugin
+    else:
+      plugin['has_build_conditional']=False
+      plugin['build_conditional']='"x${with_%(name)s_plugin}" = "xyes"' %plugin
+    plugin['shared_build']='"x${shared_%(name)s_plugin}" = "xyes"' %plugin
+
+    if plugin['install']:
+      plugin['library_type']= 'pkgplugin'
+    else:
+      plugin['library_type']= 'noinst'
+
+def find_testsuite(plugin_dir):
+  for testdir in ['drizzle-tests','tests']:
+    if os.path.isdir(os.path.join(plugin_dir,testdir)):
+      return testdir
+  if os.path.isdir(os.path.join('tests','suite',os.path.basename(plugin_dir))):
+    return ""
+  return None
+
+def find_docs(plugin_dir):
+  if os.path.isfile(os.path.join(plugin_dir, "docs", "index.rst")):
+    return os.path.join(plugin_dir, "docs")
+
+def read_plugin_ini(plugin_dir):
+    sources_default=""
+    if plugin_dir == ".":
+      plugin_name="**OUT-OF-TREE**"
+      module_name="**OUT-OF-TREE**"
+    else:
+      sources_default="%s.cc" % os.path.basename(plugin_dir)
+      plugin_name = plugin_dir[plugin_dir.index(config['root_plugin_dir']) + len(config['root_plugin_dir']) + 1:]
+      module_name = plugin_name.replace("/", config['module_name_separator']).replace("\\", config['module_name_separator'])
+      plugin_name = plugin_name.replace("/", config['plugin_name_separator']).replace("\\", config['plugin_name_separator'])
+
+
+    plugin_file= os.path.join(plugin_dir,config['plugin_ini_fname'])
+    plugin_defaults= dict(sources=sources_default,
+                          headers="",
+                          install_headers="",
+                          cflags="",
+                          cppflags="",
+                          cxxflags="",
+                          libs="",
+                          ldflags="",
+                          author="",
+                          title="",
+                          description="",
+                          license="PLUGIN_LICENSE_GPL",
+                          name=plugin_name,
+                          module_name=module_name,
+                          load_by_default=config['default_load_by_default'],
+                          disabled="False",
+                          static="False",
+                          dependencies="",
+                          dependency_aliases="",
+                          tests="",
+                          install=config['default_install'])
+    parser=ConfigParser.ConfigParser(defaults= plugin_defaults)
+    parser.read(plugin_file)
+    plugin=dict(parser.items('plugin'))
+    plugin['plugin_dir'] = plugin_dir
+    if plugin_dir == '.':
+      if not plugin.has_key('url'):
+        print "External Plugins are required to specifiy a url"
+        plugin['url']= 'http://launchpad.net/%(name)s' % plugin
+        sys.exit(1)
+      if plugin_dir == '.' and not plugin.has_key('version'):
+        print "External Plugins are required to specifiy a version"
+        sys.exit(1)
+    if not plugin.has_key('version'):
+      plugin['version'] = config['default_plugin_version']
+    if plugin.has_key('load_by_default'):
+      plugin['load_by_default']=parser.getboolean('plugin','load_by_default')
+    if plugin.has_key('disabled'):
+      plugin['disabled']=parser.getboolean('plugin','disabled')
+    if plugin['disabled']:
+      plugin['enabled']="no"
+    else:
+      plugin['enabled']="yes"
+    if plugin.has_key('static'):
+      try:
+        plugin['static']= parser.getboolean('plugin','static')
+      except:
+        if plugin['static'][:5] == os.sys.platform[:5]:
+          plugin['static']= True
+        else:
+          plugin['static']= False
+    if plugin.has_key('install'):
+      plugin['install']= parser.getboolean('plugin','install')
+    if plugin.has_key('testsuite'):
+      if plugin['testsuite'] == 'disable':
+        plugin['testsuite']= False
+        plugin['dist_testsuite']= find_testsuite(plugin_dir)
+    else:
+      plugin_testsuite= find_testsuite(plugin_dir)
+      plugin['testsuitedir']=plugin_testsuite
+      if plugin_testsuite is not None:
+        plugin['testsuite']=True
+      else:
+        plugin['testsuite']=False
+    plugin['docs']= find_docs(plugin_dir)
+
+    plugin['cflags']+= ' ' + config['extra_cflags']
+    plugin['cppflags']+= ' ' + config['extra_cppflags']
+    plugin['cxxflags']+= ' ' + config['extra_cxxflags']
+
+    plugin['libname']= "lib%s%s%s" % (config['plugin_prefix'],
+                                      plugin['name'],
+                                      config['plugin_suffix'])
+    if config['force_lowercase_libname']:
+      plugin['libname']= plugin['libname'].lower()
+
+    plugin['root_plugin_dir']= config['root_plugin_dir']
+    plugin['plugin_prefix']= config['plugin_prefix']
+    plugin['plugin_suffix']= config['plugin_suffix']
+    plugin['pkgplugindir']= config['pkgplugindir']
+
+    # Dependencies must have a module but dependency aliases are simply added
+    # to the variable passed during compile.
+    plugin['dependency_list'] = plugin['dependencies'].split()
+    dependency_aliases = plugin['dependency_aliases'].split()
+    plugin['dependencies'] = ','.join(plugin['dependency_list'] +
+                                      plugin['dependency_aliases'].split())
+    dependency_libs = ["%s/lib%s%s.la" % (config['root_plugin_dir'],
+                                          dependency.lower().replace('::', '_'),
+                                          config['plugin_suffix'])
+                       for dependency in plugin['dependency_list']]
+    plugin['libs'] = " ".join(plugin['libs'].split() + dependency_libs);
+
+# Libtool is going to expand:
+#      -DPANDORA_MODULE_AUTHOR='"Padraig O'"'"'Sullivan"'
+# to:
+# "-DPANDORA_MODULE_AUTHOR=\"Padraig O'Sullivan\""
+# So we have to replace internal ''s to '"'"'
+    for key in ('author','title','description','version'):
+      plugin[key]=plugin[key].replace('"','\\"')
+      plugin[key]=plugin[key].replace("'","'\"'\"'")
+    return plugin
+
+
+def write_plugin_am(plugin, plugin_am):
+  """Write an automake fragment for this plugin.
+
+  :param plugin: The plugin dict.
+  :param plugin_am: The file to write to.
+  """
+  # The .plugin.ini.stamp avoids changing the datestamp on plugin.ini which can
+  # confuse VCS systems.
+  plugin_am.write("""
+EXTRA_DIST += %(rel_path)s/plugin.ini
+
+# Prevent errors when a plugin dir is removed
+%(rel_path)s/plugin.ini:
+
+""" % plugin)
+  if plugin.has_key('extra_dist') and plugin['extra_dist'] != "":
+    plugin_am.write("EXTRA_DIST += %(extra_dist)s\n" % plugin)
+  if plugin['headers'] != "":
+    plugin_am.write("noinst_HEADERS += %(headers)s\n" % plugin)
+  if plugin['install_headers'] != "":
+    plugin_am.write("nobase_pkginclude_HEADERS += %(install_headers)s\n" % plugin)
+  if plugin['testsuite']:
+    if plugin.has_key('testsuitedir') and plugin['testsuitedir'] != "":
+      plugin_am.write("EXTRA_DIST += %(rel_path)s/%(testsuitedir)s\n" % plugin)
+  if plugin.has_key('dist_testsuite') and plugin['dist_testsuite'] != "":
+    plugin_am.write("EXTRA_DIST += %(rel_path)s/%(dist_testsuite)s\n" % plugin)
+  if plugin['docs'] is not None:
+    plugin_am.write("EXTRA_DIST += ${top_srcdir}/%(rel_path)s/docs/*.rst\n" % plugin)
+  plugin_am.write("""
+%(root_plugin_dir)s_%(plugin_prefix)s%(name)s_dir=${top_srcdir}/%(rel_path)s
+# Include sources in EXTRA_DIST because we might not build this, but we
+# still want the sources to wind up in a tarball
+EXTRA_DIST += %(rel_path)s/plugin.ini %(sources)s
+if %(static_build_conditional_tag)s
+  noinst_LTLIBRARIES+=%(root_plugin_dir)s/%(libname)s.la
+  %(root_plugin_dir)s_%(libname)s_la_LIBADD=%(libs)s
+  %(root_plugin_dir)s_%(libname)s_la_DEPENDENCIES=%(libs)s
+  %(root_plugin_dir)s_%(libname)s_la_LDFLAGS=$(AM_LDFLAGS) %(ldflags)s $(GCOV_LIBS)
+  %(root_plugin_dir)s_%(libname)s_la_CPPFLAGS=$(AM_CPPFLAGS) -DPANDORA_MODULE_NAME=%(module_name)s -DPANDORA_MODULE_AUTHOR='%(author)s' -DPANDORA_MODULE_TITLE='%(title)s' -DPANDORA_MODULE_VERSION='%(version)s' -DPANDORA_MODULE_LICENSE=%(license)s -DPANDORA_MODULE_DEPENDENCIES='%(dependencies)s' %(cppflags)s
+  %(root_plugin_dir)s_%(libname)s_la_CXXFLAGS=$(AM_CXXFLAGS) %(cxxflags)s
+  %(root_plugin_dir)s_%(libname)s_la_CFLAGS=$(AM_CFLAGS) %(cflags)s
+  %(root_plugin_dir)s_%(libname)s_la_SOURCES=%(sources)s
+  check_PROGRAMS += %(tests)s
+  PANDORA_DYNAMIC_LDADDS+=${top_builddir}/%(root_plugin_dir)s/%(libname)s.la
+endif
+EXTRA_DIST += %(rel_path)s/plugin.ini
+if %(shared_build_conditional_tag)s
+  %(library_type)s_LTLIBRARIES+=%(root_plugin_dir)s/%(libname)s.la
+  %(root_plugin_dir)s_%(libname)s_la_LDFLAGS=-avoid-version -rpath $(pkgplugindir) $(AM_LDFLAGS) %(ldflags)s $(GCOV_LIBS)
+  %(root_plugin_dir)s_%(libname)s_la_LIBADD=%(libs)s
+  %(root_plugin_dir)s_%(libname)s_la_DEPENDENCIES=%(libs)s
+  %(root_plugin_dir)s_%(libname)s_la_CPPFLAGS=$(AM_CPPFLAGS) -DPANDORA_DYNAMIC_PLUGIN -DPANDORA_MODULE_NAME=%(module_name)s -DPANDORA_MODULE_AUTHOR='%(author)s' -DPANDORA_MODULE_TITLE='%(title)s' -DPANDORA_MODULE_VERSION='%(version)s' -DPANDORA_MODULE_LICENSE=%(license)s -DPANDORA_MODULE_DEPENDENCIES='%(dependencies)s' %(cppflags)s
+  %(root_plugin_dir)s_%(libname)s_la_CXXFLAGS=$(AM_CXXFLAGS) %(cxxflags)s
+  %(root_plugin_dir)s_%(libname)s_la_CFLAGS=$(AM_CFLAGS) %(cflags)s
+  %(root_plugin_dir)s_%(libname)s_la_SOURCES=%(sources)s
+  check_PROGRAMS += %(tests)s
+endif
+""" % plugin)
+  plugin_am_file=os.path.join(plugin['rel_path'],'plugin.am')
+  if os.path.exists(plugin_am_file):
+    plugin_am.write('include %s\n' % plugin_am_file)
+
+#
+# MAIN STARTS HERE:
+#
+
+# Parse the pandora-plugin config file
+
+config_defaults= dict(
+  top_srcdir='.',
+  top_builddir='.',
+  plugin_ini_fname='plugin.ini',
+  plugin_prefix='',
+  plugin_suffix='',
+  extra_cflags='',
+  extra_cppflags='',
+  extra_cxxflags='',
+  root_plugin_dir='',
+  pkgplugindir='',
+  default_install='True',
+  default_plugin_version='',
+  default_load_by_default='False',
+  force_lowercase_libname='True',
+  plugin_name_separator='_',
+  module_name_separator='::'
+)
+
+config_parser = ConfigParser.ConfigParser(defaults=config_defaults)
+config_parser.read(pandora_plugin_file)
+config = dict(config_parser.items('pandora-plugin'))
+config['force_lowercase_libname']=config_parser.getboolean('pandora-plugin','force_lowercase_libname')
+
+# I'm 3 seconds away from writing a comprehensive build solution
+if not os.path.exists('config/pandora_vc_revinfo'):
+  if os.path.exists('.bzr'):
+    bzr_revno= subprocess.Popen(["bzr", "revno"], stdout=subprocess.PIPE).communicate()[0].strip()
+    rev_date= datetime.date.fromtimestamp(time.time())
+    config['default_plugin_version'] = "%d.%02d.%s" % (rev_date.year, rev_date.month, bzr_revno)
+  else:
+    config['default_plugin_version']=datetime.date.fromtimestamp(time.time()).isoformat()
+else:
+  # need to read config/pandora_vc_revno
+  pandora_vc_revno=open('config/pandora_vc_revinfo','r').read().split()
+  rev_date=""
+  bzr_revno=""
+  for revno_line in pandora_vc_revno:
+    (revno_key,revno_val)= revno_line.split("=")
+    if revno_key == 'PANDORA_VC_REVNO':
+      bzr_revno=revno_val.strip()
+    elif revno_key == 'PANDORA_RELEASE_DATE':
+      rev_date=revno_val.strip()
+
+  config['default_plugin_version'] = "%s.%s" % (rev_date, bzr_revno)
+
+actions=[]
+for arg in sys.argv:
+  if arg.startswith('--top_srcdir='):
+    config['top_srcdir']=arg[12:]
+  elif arg.startswith('--top_builddir='):
+    config['top_builddir']=arg[14:]
+  elif arg == "--force-all":
+    actions=['plugin-list','pandora-plugin.am','write']
+    break
+  else:
+    actions.append(arg)
+if len(actions) == 0:
+  actions.append('write')
+
+plugin_list=[]
+
+def accumulate_plugins(arg, dirname, fnames):
+  # plugin_ini_fname is a name in dirname indicating dirname is a plugin.
+  if config['plugin_ini_fname'] in fnames:
+    arg.append(dirname)
+
+os.path.walk(os.path.join(config['top_srcdir'],
+                          config['root_plugin_dir']),
+             accumulate_plugins,
+             plugin_list)
+
+if not os.path.exists("config/pandora-plugin.am") or "write" in actions:
+  plugin_am_file = ChangeProtectedFile(os.path.join('config', 'pandora-plugin.am'))
+  plugin_am_file.write("""
+# always the current list, generated every build so keep this lean.
+# pandora-plugin.list: datestamp preserved list
+${srcdir}/config/pandora-plugin.list: .plugin.scan
+.plugin.scan:
+	@cd ${top_srcdir} && python config/pandora-plugin plugin-list
+
+# Plugins affect configure; so to prevent configure running twice in a tarball
+# build (once up front, once with the right list of plugins, we ship the
+# generated list of plugins and the housekeeping material for that list so it
+# is likewise not updated.
+EXTRA_DIST += \
+	config/pandora-plugin.am \
+	config/pandora-plugin.ac \
+	config/pandora-plugin \
+	config/pandora-plugin.ini
+
+
+# Seed the list of plugin LDADDS which plugins may extend.
+PANDORA_DYNAMIC_LDADDS=
+
+# plugin.stamp: graph dominator for creating all per pandora-plugin.ac/am
+# files. This is invoked when the code to generate such files has altered.""")
+
+if not os.path.exists("config/pandora-plugin.ac") or "write" in actions:
+  plugin_ac_file = ChangeProtectedFile(os.path.join('config', 'pandora-plugin.ac'))
+  plugin_ac_file.write("dnl Generated file, run make to rebuild\n")
+  plugin_ac_file.write("""
+AC_ARG_WITH([all-static],[
+AS_HELP_STRING([--with-all-static],[Link all plugins staticly into the server @<:@default=no@:>@])
+],[
+    with_all_static="$withval"
+    ],[
+    with_all_static=no
+])
+  """)
+
+if os.path.exists("docs/plugins"):
+  if not os.path.exists("docs/plugins/list.rst") or "write" in actions:
+    plugin_doc_index = ChangeProtectedFile("docs/plugins/list.rst")
+    plugin_doc_index.write("""
+Plugin Documentation
+====================
+
+.. toctree::
+   :maxdepth: 2
+""")
+
+
+if os.path.exists('plugin.ini'):
+  # Are we in a plugin dir which wants to have a self-sufficient build system?
+  plugin_list=['.']
+
+  write_external_plugin()
+else:
+  plugin_list_file = ChangeProtectedFile(os.path.join('config', 'pandora-plugin.list'))
+  for p in plugin_list:
+    plugin_list_file.write(p)
+    plugin_list_file.write("\n")
+  plugin_list.sort()
+  plugin_list_file.close()
+
+if not os.path.exists("config/pandora-plugin.am") or 'write' in actions:
+  plugin_am_file.write("\n${top_srcdir}/config/pandora-plugin.am: ${top_srcdir}/config/pandora-plugin.list ${top_srcdir}/config/pandora-plugin ")
+  for plugin_dir in plugin_list:
+    plugin_am_file.write("\\\n\t%s/plugin.ini " % plugin_dir)
+  plugin_am_file.write("\n\tcd ${top_srcdir} && python config/pandora-plugin write\n")
+  plugin_ini_list=[]
+
+  # Load all plugin.ini files first so we can do dependency tracking.
+  for plugin_dir in plugin_list:
+    plugin = read_plugin_ini(plugin_dir)
+    expand_plugin_ini(plugin)
+    plugin_ini_list.append(plugin)
+
+  # Check for duplicates
+  plugin_name_list = [plugin['libname'] for plugin in plugin_ini_list]
+  for plugin in plugin_ini_list:
+    if plugin_name_list.count(plugin['libname']) != 1:
+      print "Duplicate module name %s" % plugin['libname']
+      exit(1)
+
+  for plugin in plugin_ini_list:
+    write_plugin(plugin, plugin_ini_list)
+
+if plugin_am_file is not None:
+  plugin_am_file.close()
+if plugin_ac_file is not None:
+  plugin_ac_file.close()
+if plugin_doc_index is not None:
+  plugin_doc_index.close()

=== modified file 'configure.ac'
--- configure.ac	2011-04-08 03:55:42 +0000
+++ configure.ac	2011-04-16 05:39:23 +0000
@@ -12,7 +12,7 @@
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR(m4)
 
-PANDORA_CANONICAL_TARGET(require-cxx)
+PANDORA_CANONICAL_TARGET(require-cxx, no-vc-changelog)
 
 GEARMAN_LIBRARY_VERSION=5:1:1
 #                       | | |

=== modified file 'libgearman-server/byte.h'
--- libgearman-server/byte.h	2011-03-16 22:23:41 +0000
+++ libgearman-server/byte.h	2011-04-16 05:39:23 +0000
@@ -43,7 +43,8 @@
 
 class Byte {
 public:
-  Byte ()
+  Byte () :
+    _array()
   { }
 
   Byte (size_t arg):

=== modified file 'libgearman-server/plugins/protocol/http/protocol.cc'
--- libgearman-server/plugins/protocol/http/protocol.cc	2011-03-16 22:23:41 +0000
+++ libgearman-server/plugins/protocol/http/protocol.cc	2011-04-16 05:39:23 +0000
@@ -44,7 +44,8 @@
 HTTP::HTTP() :
   Plugin("HTTP"),
   _background(false),
-  _keep_alive(false)
+  _keep_alive(false),
+  global_port("")
 {
   command_line_options().add_options()
     ("http-port", boost::program_options::value(&global_port)->default_value(GEARMAN_PROTOCOL_HTTP_DEFAULT_PORT), "Port to listen on.");

=== modified file 'libgearman-server/plugins/queue/drizzle/include.am'
--- libgearman-server/plugins/queue/drizzle/include.am	2011-03-16 22:23:41 +0000
+++ libgearman-server/plugins/queue/drizzle/include.am	2011-04-16 05:39:23 +0000
@@ -17,5 +17,8 @@
 						 libgearman-server/plugins/queue/drizzle/queue.cc
 
 libgearman_server_libgearman_server_la_LIBADD+= $(LTLIBDRIZZLE)
+libgearman_server_libgearman_server_la_CXXFLAGS= \
+						 $(AM_CXXFLAGS) \
+						 $(LIBDRIZZLE_CFLAGS)
 endif
 

=== modified file 'libgearman-server/plugins/queue/drizzle/queue.cc'
--- libgearman-server/plugins/queue/drizzle/queue.cc	2011-04-05 23:59:40 +0000
+++ libgearman-server/plugins/queue/drizzle/queue.cc	2011-04-16 05:39:23 +0000
@@ -82,13 +82,26 @@
   bool mysql_protocol;
   in_port_t port;
 private:
+  Drizzle(const Drizzle&);
+  Drizzle& operator=(const Drizzle&);
 };
 
 
 Drizzle::Drizzle () :
   Queue("libdrizzle"),
   drizzle(NULL),
-  con(NULL)
+  con(NULL),
+  _result(),
+  _query(),
+  host(""),
+  username(""),
+  password(""),
+  uds(""),
+  user(""),
+  schema(""),
+  table(""),
+  mysql_protocol(false),
+  port(0)
 {
   command_line_options().add_options()
   ("libdrizzle-host", boost::program_options::value(&host), "Host of server.")

=== modified file 'libgearman-server/plugins/queue/libmemcached/queue.cc'
--- libgearman-server/plugins/queue/libmemcached/queue.cc	2011-04-05 23:59:40 +0000
+++ libgearman-server/plugins/queue/libmemcached/queue.cc	2011-04-16 05:39:23 +0000
@@ -79,7 +79,7 @@
 }
 
 } // namespace queue
-} // namespace plugin
+} // namespace plugins
 } // namespace gearmand
 
 /* Queue callback functions. */

=== modified file 'libgearman-server/plugins/queue/postgres/queue.cc'
--- libgearman-server/plugins/queue/postgres/queue.cc	2011-04-05 23:59:40 +0000
+++ libgearman-server/plugins/queue/postgres/queue.cc	2011-04-16 05:39:23 +0000
@@ -57,11 +57,16 @@
   std::string table;
   std::vector<char> query_buffer;
 private:
+  Postgres(const Postgres&);
+  Postgres& operator=(const Postgres&);
 };
 
 Postgres::Postgres() :
   Queue("Postgres"),
-  con(NULL)
+  con(NULL),
+  postgres_connect_string(""),
+  table(""),
+  query_buffer()
 {
   command_line_options().add_options()
     ("libpq-conninfo", boost::program_options::value(&postgres_connect_string)->default_value(""), "PostgreSQL connection information string.")

=== modified file 'libgearman-server/plugins/queue/sqlite/queue.cc'
--- libgearman-server/plugins/queue/sqlite/queue.cc	2011-04-14 05:40:29 +0000
+++ libgearman-server/plugins/queue/sqlite/queue.cc	2011-04-16 05:39:23 +0000
@@ -40,7 +40,9 @@
 namespace plugins {
 namespace queue {
 
-class Sqlite : public gearmand::plugins::Queue {
+class Sqlite :
+  public gearmand::plugins::Queue
+{
 public:
   Sqlite();
   ~Sqlite();
@@ -65,10 +67,18 @@
 private:
   std::string _insert_query;
   std::string _delete_query;
+  Sqlite(const Sqlite&);
+  Sqlite& operator=(const Sqlite&);
 };
 
 Sqlite::Sqlite() :
-  Queue("sqlite")
+  Queue("sqlite"),
+  schema(""),
+  table(""),
+  db(NULL),
+  in_trans(0),
+  _insert_query(""),
+  _delete_query("")
 {
   command_line_options().add_options()
     ("libsqlite3-db", boost::program_options::value(&schema), "Database file to use.")

=== modified file 'libgearman-server/plugins/queue/tokyocabinet/queue.cc'
--- libgearman-server/plugins/queue/tokyocabinet/queue.cc	2011-04-05 23:59:40 +0000
+++ libgearman-server/plugins/queue/tokyocabinet/queue.cc	2011-04-16 05:39:23 +0000
@@ -37,10 +37,15 @@
   std::string filename;
   bool optimize;
 private:
+  TokyoCabinet(const TokyoCabinet&);
+  TokyoCabinet& operator=(const TokyoCabinet&);
 };
 
 TokyoCabinet::TokyoCabinet() :
-  Queue("tokyocabinet")
+  Queue("tokyocabinet"),
+  db(NULL),
+  filename(NULL),
+  optimize(false)
 {
   command_line_options().add_options()
     ("libtokyocabinet-file", boost::program_options::value(&filename), "File name of the database. [see: man tcadb, tcadbopen() for name guidelines]")

=== modified file 'libgearman/client.cc'
--- libgearman/client.cc	2011-04-13 04:12:34 +0000
+++ libgearman/client.cc	2011-04-16 05:39:23 +0000
@@ -204,19 +204,19 @@
   memset(&options, 0, sizeof(int32_t));
 
   if (client->options.allocated)
-    options|= (int)GEARMAN_CLIENT_ALLOCATED;
+    options|= int(GEARMAN_CLIENT_ALLOCATED);
   if (client->options.non_blocking)
-    options|= (int)GEARMAN_CLIENT_NON_BLOCKING;
+    options|= int(GEARMAN_CLIENT_NON_BLOCKING);
   if (client->options.task_in_use)
-    options|= (int)GEARMAN_CLIENT_TASK_IN_USE;
+    options|= int(GEARMAN_CLIENT_TASK_IN_USE);
   if (client->options.unbuffered_result)
-    options|= (int)GEARMAN_CLIENT_UNBUFFERED_RESULT;
+    options|= int(GEARMAN_CLIENT_UNBUFFERED_RESULT);
   if (client->options.no_new)
-    options|= (int)GEARMAN_CLIENT_NO_NEW;
+    options|= int(GEARMAN_CLIENT_NO_NEW);
   if (client->options.free_tasks)
-    options|= (int)GEARMAN_CLIENT_FREE_TASKS;
+    options|= int(GEARMAN_CLIENT_FREE_TASKS);
 
-  return (gearman_client_options_t)options;
+  return gearman_client_options_t(options);
 }
 
 void gearman_client_set_options(gearman_client_st *client,
@@ -297,7 +297,7 @@
 
 void *gearman_client_context(const gearman_client_st *client)
 {
-  return (void *)(client->context);
+  return static_cast<void *>(client->context);
 }
 
 void gearman_client_set_context(gearman_client_st *client, void *context)
@@ -922,14 +922,14 @@
                                             GEARMAN_SERVER_ERROR,
                                             "gearman_client_run_tasks",
                                             "%s:%.*s",
-                                            (char *)(client->con->packet.arg[0]),
-                                            (int)(client->con->packet.arg_size[1]),
-                                            (char *)(client->con->packet.arg[1]));
+                                            static_cast<char *>(client->con->packet.arg[0]),
+                                            int(client->con->packet.arg_size[1]),
+                                            static_cast<char *>(client->con->packet.arg[1]));
 
                 return GEARMAN_SERVER_ERROR;
               }
               else if (strncmp(client->task->job_handle,
-                               (char *)(client->con->packet.arg[0]),
+                               static_cast<char *>(client->con->packet.arg[0]),
                                client->con->packet.arg_size[0]) ||
                        (client->con->packet.command != GEARMAN_COMMAND_WORK_FAIL &&
                         strlen(client->task->job_handle) != client->con->packet.arg_size[0] - 1) ||
@@ -1094,7 +1094,7 @@
 static gearman_return_t _client_add_server(const char *host, in_port_t port,
                                            void *context)
 {
-  return gearman_client_add_server((gearman_client_st *)context, host, port);
+  return gearman_client_add_server(static_cast<gearman_client_st *>(context), host, port);
 }
 
 static gearman_task_st *_client_add_task(gearman_client_st *client,
@@ -1150,7 +1150,8 @@
   if (command == GEARMAN_COMMAND_SUBMIT_JOB_EPOCH)
   {
     char time_string[30];
-    int length= snprintf(time_string, sizeof(time_string), "%lld", (long long)when);
+    int length= snprintf(time_string, sizeof(time_string), "%lld",
+                         static_cast<long long>(when));
     args[2]= time_string;
     args_size[2]= length +1;
     args[3]= workload;
@@ -1300,8 +1301,8 @@
     if (task->recv->command == GEARMAN_COMMAND_JOB_CREATED)
     {
       snprintf(task->job_handle, GEARMAN_JOB_HANDLE_SIZE, "%.*s",
-               (int)(task->recv->arg_size[0]),
-               (char *)(task->recv->arg[0]));
+               int(task->recv->arg_size[0]),
+               static_cast<char *>(task->recv->arg[0]));
 
   case GEARMAN_TASK_STATE_CREATED:
       if (client->created_fn != NULL)
@@ -1353,12 +1354,12 @@
     {
       if (task->recv->command == GEARMAN_COMMAND_STATUS_RES)
       {
-        if (atoi((char *)task->recv->arg[1]) == 0)
+        if (atoi(static_cast<char *>(task->recv->arg[1])) == 0)
           task->options.is_known= false;
         else
           task->options.is_known= true;
 
-        if (atoi((char *)task->recv->arg[2]) == 0)
+        if (atoi(static_cast<char *>(task->recv->arg[2])) == 0)
           task->options.is_running= false;
         else
           task->options.is_running= true;
@@ -1370,11 +1371,11 @@
         x= 1;
       }
 
-      task->numerator= (uint32_t)atoi((char *)task->recv->arg[x]);
+      task->numerator= uint32_t(atoi(static_cast<char *>(task->recv->arg[x])));
       snprintf(status_buffer, 11, "%.*s",
-               (int)(task->recv->arg_size[x + 1]),
-               (char *)(task->recv->arg[x + 1]));
-      task->denominator= (uint32_t)atoi(status_buffer);
+               int(task->recv->arg_size[x + 1]),
+               static_cast<char *>(task->recv->arg[x + 1]));
+      task->denominator= uint32_t(atoi(status_buffer));
 
   case GEARMAN_TASK_STATE_STATUS:
       if (client->status_fn != NULL)
@@ -1507,7 +1508,7 @@
     client->do_data_size= 0;
   }
 
-  return (void *)workload;
+  return const_cast<void *>(workload);
 }
 
 static gearman_return_t _client_do_background(gearman_client_st *client,
@@ -1557,7 +1558,7 @@
 
 static gearman_return_t _client_do_data(gearman_task_st *task)
 {
-  gearman_client_st *client= (gearman_client_st *)gearman_task_context(task);
+  gearman_client_st *client= const_cast<gearman_client_st *>(static_cast<const gearman_client_st *>(gearman_task_context(task)));
 
   if (client->do_ret != GEARMAN_SUCCESS)
   {
@@ -1581,7 +1582,7 @@
 
 static gearman_return_t _client_do_status(gearman_task_st *task)
 {
-  gearman_client_st *client= (gearman_client_st *)gearman_task_context(task);
+  gearman_client_st *client= const_cast<gearman_client_st *>(static_cast<const gearman_client_st *>(gearman_task_context(task)));
 
   if (client->do_ret != GEARMAN_SUCCESS)
   {
@@ -1595,7 +1596,7 @@
 
 static gearman_return_t _client_do_fail(gearman_task_st *task)
 {
-  gearman_client_st *client= (gearman_client_st *)gearman_task_context(task);
+  gearman_client_st *client= const_cast<gearman_client_st *>(static_cast<const gearman_client_st *>(gearman_task_context(task)));
 
   client->do_ret= GEARMAN_WORK_FAIL;
   return GEARMAN_SUCCESS;

=== modified file 'libgearman/connection.cc'
--- libgearman/connection.cc	2011-04-14 05:40:29 +0000
+++ libgearman/connection.cc	2011-04-16 05:39:23 +0000
@@ -252,7 +252,7 @@
           NI_MAXHOST);
   connection->host[NI_MAXHOST - 1]= 0;
 
-  connection->port= (in_port_t)(port == 0 ? GEARMAN_DEFAULT_TCP_PORT : port);
+  connection->port= in_port_t(port == 0 ? GEARMAN_DEFAULT_TCP_PORT : port);
 }
 
 void gearman_connection_close(gearman_connection_st *connection)
@@ -416,14 +416,14 @@
     if (connection->send_buffer_size < GEARMAN_SEND_BUFFER_SIZE)
     {
       memcpy(connection->send_buffer,
-             (char *)packet->data + connection->send_data_offset,
+             static_cast<char *>(const_cast<void *>(packet->data)) + connection->send_data_offset,
              connection->send_buffer_size);
       connection->send_data_size= 0;
       connection->send_data_offset= 0;
       break;
     }
 
-    connection->send_buffer_ptr= (char *)packet->data + connection->send_data_offset;
+    connection->send_buffer_ptr= static_cast<char *>(const_cast<void *>(packet->data)) + connection->send_data_offset;
     connection->send_state= GEARMAN_CON_SEND_UNIVERSAL_FLUSH_DATA;
 
   case GEARMAN_CON_SEND_UNIVERSAL_FLUSH:
@@ -473,7 +473,7 @@
     return GEARMAN_DATA_TOO_LARGE;
   }
 
-  connection->send_buffer_ptr= (char *)data;
+  connection->send_buffer_ptr= static_cast<char *>(const_cast<void *>(data));
   connection->send_buffer_size= data_size;
 
   *ret_ptr= gearman_connection_flush(connection);
@@ -500,7 +500,7 @@
         connection->addrinfo= NULL;
       }
 
-      snprintf(port_str, NI_MAXSERV, "%hu", (uint16_t)connection->port);
+      snprintf(port_str, NI_MAXSERV, "%hu", uint16_t(connection->port));
 
       memset(&ai, 0, sizeof(struct addrinfo));
       ai.ai_socktype= SOCK_STREAM;
@@ -663,10 +663,10 @@
           return GEARMAN_ERRNO;
         }
 
-        connection->send_buffer_size-= (size_t)write_size;
+        connection->send_buffer_size-= size_t(write_size);
         if (connection->send_state == GEARMAN_CON_SEND_UNIVERSAL_FLUSH_DATA)
         {
-          connection->send_data_offset+= (size_t)write_size;
+          connection->send_data_offset+= size_t(write_size);
           if (connection->send_data_offset == connection->send_data_size)
           {
             connection->send_data_size= 0;
@@ -776,7 +776,7 @@
     else
     {
       packet->data= packet->universal->workload_malloc_fn(packet->data_size,
-                                                        (void *)packet->universal->workload_malloc_context);
+                                                        static_cast<void *>(packet->universal->workload_malloc_context));
     }
     if (packet->data == NULL)
     {
@@ -792,7 +792,7 @@
     while (connection->recv_data_size != 0)
     {
       (void)gearman_connection_recv_data(connection,
-                                         ((uint8_t *)(packet->data)) +
+                                         static_cast<uint8_t *>(const_cast<void *>(packet->data)) +
                                          connection->recv_data_offset,
                                          packet->data_size -
                                          connection->recv_data_offset, ret_ptr);
@@ -844,7 +844,8 @@
 
   if (data_size != recv_size)
   {
-    recv_size+= gearman_connection_read(connection, ((uint8_t *)data) + recv_size,
+    recv_size+= gearman_connection_read(connection,
+                                        static_cast<uint8_t *>(const_cast<void *>(data)) + recv_size,
                                         data_size - recv_size, ret_ptr);
     connection->recv_data_offset+= recv_size;
   }
@@ -928,7 +929,7 @@
   }
 
   *ret_ptr= GEARMAN_SUCCESS;
-  return (size_t)read_size;
+  return size_t(read_size);
 }
 
 gearman_return_t gearman_connection_set_events(gearman_connection_st *connection, short events)
@@ -943,7 +944,7 @@
   if (connection->universal->event_watch_fn != NULL)
   {
     ret= connection->universal->event_watch_fn(connection, connection->events,
-                                      (void *)connection->universal->event_watch_context);
+                                      static_cast<void *>(connection->universal->event_watch_context));
     if (ret != GEARMAN_SUCCESS)
     {
       gearman_connection_close(connection);
@@ -971,7 +972,7 @@
       connection->universal->event_watch_fn != NULL)
   {
     ret= connection->universal->event_watch_fn(connection, connection->events,
-                                      (void *)connection->universal->event_watch_context);
+                                      static_cast<void *>(connection->universal->event_watch_context));
     if (ret != GEARMAN_SUCCESS)
     {
       gearman_connection_close(connection);
@@ -979,7 +980,7 @@
     }
   }
 
-  connection->events&= (short)~revents;
+  connection->events&= short(~revents);
 
   return GEARMAN_SUCCESS;
 }
@@ -996,7 +997,7 @@
 
   ret= 1;
   ret= setsockopt(connection->fd, IPPROTO_TCP, TCP_NODELAY, &ret,
-                  (socklen_t)sizeof(int));
+                  socklen_t(sizeof(int)));
   if (ret == -1 && errno != EOPNOTSUPP)
   {
     gearman_perror(connection->universal, "setsockopt(TCP_NODELAY)");
@@ -1006,7 +1007,7 @@
   linger.l_onoff= 1;
   linger.l_linger= GEARMAN_DEFAULT_SOCKET_TIMEOUT;
   ret= setsockopt(connection->fd, SOL_SOCKET, SO_LINGER, &linger,
-                  (socklen_t)sizeof(struct linger));
+                  socklen_t(sizeof(struct linger)));
   if (ret == -1)
   {
     gearman_perror(connection->universal, "setsockopt(SO_LINGER)");
@@ -1016,7 +1017,7 @@
   waittime.tv_sec= GEARMAN_DEFAULT_SOCKET_TIMEOUT;
   waittime.tv_usec= 0;
   ret= setsockopt(connection->fd, SOL_SOCKET, SO_SNDTIMEO, &waittime,
-                  (socklen_t)sizeof(struct timeval));
+                  socklen_t(sizeof(struct timeval)));
   if (ret == -1 && errno != ENOPROTOOPT)
   {
     gearman_perror(connection->universal, "setsockopt(SO_SNDTIMEO)");
@@ -1024,7 +1025,7 @@
   }
 
   ret= setsockopt(connection->fd, SOL_SOCKET, SO_RCVTIMEO, &waittime,
-                  (socklen_t)sizeof(struct timeval));
+                  socklen_t(sizeof(struct timeval)));
   if (ret == -1 && errno != ENOPROTOOPT)
   {
     gearman_perror(connection->universal, "setsockopt(SO_RCVTIMEO)");
@@ -1032,7 +1033,7 @@
   }
 
   ret= GEARMAN_DEFAULT_SOCKET_SEND_SIZE;
-  ret= setsockopt(connection->fd, SOL_SOCKET, SO_SNDBUF, &ret, (socklen_t)sizeof(int));
+  ret= setsockopt(connection->fd, SOL_SOCKET, SO_SNDBUF, &ret, socklen_t(sizeof(int)));
   if (ret == -1)
   {
     gearman_perror(connection->universal, "setsockopt(SO_SNDBUF)");
@@ -1042,7 +1043,7 @@
 #if defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
   {
     ret= 1;
-    setsockopt(connection->fd, SOL_SOCKET, SO_NOSIGPIPE, (void *)&ret, sizeof(int));
+    setsockopt(connection->fd, SOL_SOCKET, SO_NOSIGPIPE, static_cast<void *>(&ret), sizeof(int));
 
     // This is not considered a fatal error 
     if (ret == -1)
@@ -1053,7 +1054,7 @@
 #endif
 
   ret= GEARMAN_DEFAULT_SOCKET_RECV_SIZE;
-  ret= setsockopt(connection->fd, SOL_SOCKET, SO_RCVBUF, &ret, (socklen_t)sizeof(int));
+  ret= setsockopt(connection->fd, SOL_SOCKET, SO_RCVBUF, &ret, socklen_t(sizeof(int)));
   if (ret == -1)
   {
     gearman_perror(connection->universal, "setsockopt(SO_RCVBUF)");

=== modified file 'libgearman/job.cc'
--- libgearman/job.cc	2011-04-13 04:12:34 +0000
+++ libgearman/job.cc	2011-04-16 05:39:23 +0000
@@ -288,18 +288,18 @@
 
 const char *gearman_job_handle(const gearman_job_st *job)
 {
-  return (const char *)job->assigned.arg[0];
+  return static_cast<const char *>(job->assigned.arg[0]);
 }
 
 const char *gearman_job_function_name(const gearman_job_st *job)
 {
-  return (const char *)job->assigned.arg[1];
+  return static_cast<const char *>(job->assigned.arg[1]);
 }
 
 const char *gearman_job_unique(const gearman_job_st *job)
 {
   if (job->assigned.command == GEARMAN_COMMAND_JOB_ASSIGN_UNIQ)
-    return (const char *)job->assigned.arg[2];
+    return static_cast<const char *>(job->assigned.arg[2]);
   return "";
 }
 

=== modified file 'libgearman/task.cc'
--- libgearman/task.cc	2011-04-13 04:12:34 +0000
+++ libgearman/task.cc	2011-04-16 05:39:23 +0000
@@ -110,7 +110,7 @@
   if (task != &(task->client->do_task) && task->context != NULL &&
       task->client->task_context_free_fn != NULL)
   {
-    task->client->task_context_free_fn(task, (void *)task->context);
+    task->client->task_context_free_fn(task, static_cast<void *>(task->context));
   }
 
   if (task->client->task_list == task)

=== modified file 'libgearman/universal.cc'
--- libgearman/universal.cc	2011-04-14 05:40:29 +0000
+++ libgearman/universal.cc	2011-04-16 05:39:23 +0000
@@ -404,7 +404,7 @@
   }
 
   size= strlen(gearman_strerror(rc));
-  ptr= (char *)memcpy(log_buffer, gearman_strerror(rc), size);
+  ptr= static_cast<char *>(memcpy(log_buffer, gearman_strerror(rc), size));
   ptr+= size;
 
   ptr[0]= '>';
@@ -412,7 +412,7 @@
   ptr++;
 
   size= strlen(function);
-  ptr= (char *)memcpy(ptr, (void*)function, size);
+  ptr= static_cast<char *>(memcpy(ptr, static_cast<void*>(const_cast<char *>(function)), size));
   ptr+= size;
 
   ptr[0]= ':';
@@ -420,7 +420,7 @@
   ptr++;
 
   va_start(args, format);
-  size+= (size_t)vsnprintf(ptr, GEARMAN_MAX_ERROR_SIZE - size, format, args);
+  size+= size_t(vsnprintf(ptr, GEARMAN_MAX_ERROR_SIZE - size, format, args));
   va_end(args);
 
   if (universal->log_fn == NULL)
@@ -433,7 +433,7 @@
   else
   {
     universal->log_fn(log_buffer, GEARMAN_VERBOSE_FATAL,
-                      (void *)universal->log_context);
+                      static_cast<void *>(universal->log_context));
   }
 }
 

=== modified file 'libgearman/worker.cc'
--- libgearman/worker.cc	2011-04-14 05:40:29 +0000
+++ libgearman/worker.cc	2011-04-16 05:39:23 +0000
@@ -187,7 +187,7 @@
     else
     {
       (&worker->universal)->workload_free_fn(worker->work_result,
-                                (void *)(&worker->universal)->workload_free_context);
+                                static_cast<void *>((&worker->universal)->workload_free_context));
     }
   }
 
@@ -219,25 +219,25 @@
   memset(&options, 0, sizeof(gearman_worker_options_t));
 
   if (worker->options.allocated)
-    options|= (int)GEARMAN_WORKER_ALLOCATED;
+    options|= int(GEARMAN_WORKER_ALLOCATED);
   if (worker->options.non_blocking)
-    options|= (int)GEARMAN_WORKER_NON_BLOCKING;
+    options|= int(GEARMAN_WORKER_NON_BLOCKING);
   if (worker->options.packet_init)
-    options|= (int)GEARMAN_WORKER_PACKET_INIT;
+    options|= int(GEARMAN_WORKER_PACKET_INIT);
   if (worker->options.grab_job_in_use)
-    options|= (int)GEARMAN_WORKER_GRAB_JOB_IN_USE;
+    options|= int(GEARMAN_WORKER_GRAB_JOB_IN_USE);
   if (worker->options.pre_sleep_in_use)
-    options|= (int)GEARMAN_WORKER_PRE_SLEEP_IN_USE;
+    options|= int(GEARMAN_WORKER_PRE_SLEEP_IN_USE);
   if (worker->options.work_job_in_use)
-    options|= (int)GEARMAN_WORKER_WORK_JOB_IN_USE;
+    options|= int(GEARMAN_WORKER_WORK_JOB_IN_USE);
   if (worker->options.change)
-    options|= (int)GEARMAN_WORKER_CHANGE;
+    options|= int(GEARMAN_WORKER_CHANGE);
   if (worker->options.grab_uniq)
-    options|= (int)GEARMAN_WORKER_GRAB_UNIQ;
+    options|= int(GEARMAN_WORKER_GRAB_UNIQ);
   if (worker->options.timeout_return)
-    options|= (int)GEARMAN_WORKER_TIMEOUT_RETURN;
+    options|= int(GEARMAN_WORKER_TIMEOUT_RETURN);
 
-  return (gearman_worker_options_t)options;
+  return gearman_worker_options_t(options);
 }
 
 void gearman_worker_set_options(gearman_worker_st *worker,
@@ -713,7 +713,7 @@
         else
         {
           if ((&worker->universal)->timeout > 0)
-            usleep((unsigned int)(&worker->universal)->timeout * 1000);
+            usleep(static_cast<unsigned int>((&worker->universal)->timeout) * 1000);
 
           if (worker->options.timeout_return)
           {
@@ -841,7 +841,7 @@
 
   case GEARMAN_WORKER_WORK_UNIVERSAL_FUNCTION:
     worker->work_result= worker->work_function->worker_fn(&(worker->work_job),
-                                         (void *)worker->work_function->context,
+                                         static_cast<void *>(worker->work_function->context),
                                          &(worker->work_result_size), &ret);
     if (ret == GEARMAN_WORK_FAIL)
     {
@@ -1020,7 +1020,8 @@
 static gearman_return_t _worker_add_server(const char *host, in_port_t port,
                                            void *context)
 {
-  return gearman_worker_add_server((gearman_worker_st *)context, host, port);
+  return gearman_worker_add_server(static_cast<gearman_worker_st *>(context),
+                                   host, port);
 }
 
 static gearman_return_t _worker_function_create(gearman_worker_st *worker,

=== modified file 'libtest/test.h'
--- libtest/test.h	2011-03-28 00:28:55 +0000
+++ libtest/test.h	2011-04-16 05:39:23 +0000
@@ -116,6 +116,10 @@
 
   virtual ~world_st()
   { }
+
+private:
+  world_st(const world_st&);
+  world_st& operator=(const world_st&);
 };
 
 

=== added file 'm4/iconv.m4'
--- m4/iconv.m4	1970-01-01 00:00:00 +0000
+++ m4/iconv.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,214 @@
+# 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
+])

=== modified file 'm4/pandora_64bit.m4'
--- m4/pandora_64bit.m4	2009-09-29 04:30:01 +0000
+++ m4/pandora_64bit.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 
@@ -20,9 +20,9 @@
         [isainfo_b=`${ISAINFO} -b`],
         [isainfo_b="x"])
 
-  AS_IF([test "$isainfo_b" != "x"],[
+  AS_IF([test "$isainfo_b" != "x" -a "$isainfo_b" != "32"],[
 
-    isainfo_k=`${ISAINFO} -k` 
+    isainfo_k=`${ISAINFO} -k`
     DTRACEFLAGS="${DTRACEFLAGS} -${isainfo_b}"
 
     AS_IF([test "x$ac_enable_64bit" = "xyes"],[
@@ -32,7 +32,7 @@
       ])
 
       AS_IF([test "x$libdir" = "x\${exec_prefix}/lib"],[
-       dnl The user hasn't overridden the default libdir, so we'll 
+       dnl The user hasn't overridden the default libdir, so we'll
        dnl the dir suffix to match solaris 32/64-bit policy
        libdir="${libdir}/${isainfo_k}"
       ])

=== added file 'm4/pandora_bison.m4'
--- m4/pandora_bison.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_bison.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,33 @@
+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"],
+      PANDORA_MSG_ERROR(["bison is required for ${PACKAGE} to build from a bzr branch"])
+      )
+])

=== modified file 'm4/pandora_canonical.m4'
--- m4/pandora_canonical.m4	2011-03-03 07:48:59 +0000
+++ m4/pandora_canonical.m4	2011-04-16 05:39:23 +0000
@@ -4,7 +4,15 @@
 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.171])
+AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.177])
+
+AC_DEFUN([PANDORA_MSG_ERROR],[
+  AS_IF([test "x${pandora_cv_skip_requires}" != "xno"],[
+    AC_MSG_ERROR($1)
+  ],[
+    AC_MSG_WARN($1)
+  ])
+])
 
 AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
   AC_ARG_ENABLE([fat-binaries],
@@ -25,7 +33,7 @@
 
 AC_DEFUN([PANDORA_BLOCK_BAD_OPTIONS],[
   AS_IF([test "x${prefix}" = "x"],[
-    AC_MSG_ERROR([--prefix requires an argument])
+    PANDORA_MSG_ERROR([--prefix requires an argument])
   ])
 ])
 
@@ -115,7 +123,7 @@
     vc_changelog=yes
   ])
   m4_if(PCT_VERSION_FROM_VC,yes,[
-    PANDORA_VC_VERSION
+    PANDORA_VC_INFO_HEADER
   ],[
     PANDORA_TEST_VC_DIR
 
@@ -151,7 +159,7 @@
   PANDORA_CHECK_CXX_STANDARD
   m4_if(PCT_REQUIRE_CXX, [yes], [
     AS_IF([test "$ac_cv_cxx_stdcxx_98" = "no"],[
-      AC_MSG_ERROR([No working C++ Compiler has been found. ${PACKAGE} requires a C++ compiler that can handle C++98])
+      PANDORA_MSG_ERROR([No working C++ Compiler has been found. ${PACKAGE} requires a C++ compiler that can handle C++98])
     ])
   ])
   PANDORA_CXX_CSTDINT
@@ -182,12 +190,12 @@
   # off_t is not a builtin type
   AC_CHECK_SIZEOF(off_t, 4)
   AS_IF([test "$ac_cv_sizeof_off_t" -eq 0],[
-    AC_MSG_ERROR("${PACKAGE} needs an off_t type.")
+    PANDORA_MSG_ERROR("${PACKAGE} needs an off_t type.")
   ])
 
   AC_CHECK_SIZEOF(size_t)
   AS_IF([test "$ac_cv_sizeof_size_t" -eq 0],[
-    AC_MSG_ERROR("${PACKAGE} needs an size_t type.")
+    PANDORA_MSG_ERROR("${PACKAGE} needs an size_t type.")
   ])
 
   AC_DEFINE_UNQUOTED([SIZEOF_SIZE_T],[$ac_cv_sizeof_size_t],[Size of size_t as computed by sizeof()])
@@ -268,6 +276,7 @@
 
   AC_LIB_PREFIX
   PANDORA_HAVE_BETTER_MALLOC
+  PANDORA_WITH_VALGRIND
 
   AC_CHECK_PROGS([DOXYGEN], [doxygen])
   AC_CHECK_PROGS([PERL], [perl])
@@ -328,6 +337,7 @@
 #error "You should include config.h as your first include file"
 #endif
 
+#include <config/top.h>
 ])
   mkdir -p config
   cat > config/top.h.stamp <<EOF_CONFIG_TOP
@@ -374,14 +384,6 @@
 #define SOCKET_ERROR -1
 #define closesocket(a) close(a)
 #define get_socket_errno() errno
-#endif // TARGET_OS_WINDOWS
-
-#ifndef HAVE_MSG_NOSIGNAL
-#define MSG_NOSIGNAL 0
-#endif
-
-#ifndef HAVE_MSG_DONTWAIT
-#define MSG_DONTWAIT 0
 #endif
 
 #if defined(__cplusplus)

=== modified file 'm4/pandora_check_compiler_version.m4'
--- m4/pandora_check_compiler_version.m4	2009-07-08 07:19:19 +0000
+++ m4/pandora_check_compiler_version.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 

=== modified file 'm4/pandora_check_cxx_standard.m4'
--- m4/pandora_check_cxx_standard.m4	2009-12-18 18:02:39 +0000
+++ m4/pandora_check_cxx_standard.m4	2011-04-16 05:39:23 +0000
@@ -1,10 +1,10 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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_CHECK_CXX_STANDARD],[
-  AC_REQUIRE([AC_CXX_COMPILE_STDCXX_0X])
+  dnl AC_REQUIRE([AC_CXX_COMPILE_STDCXX_0X])
   AS_IF([test "$GCC" = "yes"],
         [AS_IF([test "$ac_cv_cxx_compile_cxx0x_native" = "yes"],[],
                [AS_IF([test "$ac_cv_cxx_compile_cxx0x_gxx" = "yes"],

=== modified file 'm4/pandora_cinttypes.m4'
--- m4/pandora_cinttypes.m4	2009-12-18 18:02:39 +0000
+++ m4/pandora_cinttypes.m4	2011-04-16 05:39:23 +0000
@@ -1,3 +1,8 @@
+# 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 cinttypes. We
 # include AC_TRY_COMPILE for all the combinations we've seen in the
 # wild.  We define one of HAVE_CINTTYPES or HAVE_TR1_CINTTYPES or 

=== added file 'm4/pandora_compile_stdcxx_0x.m4'
--- m4/pandora_compile_stdcxx_0x.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_compile_stdcxx_0x.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,103 @@
+# ===========================================================================
+#        http://autoconf-archive.cryp.to/ac_cxx_compile_stdcxx_0x.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AC_CXX_COMPILE_STDCXX_0X
+#
+# DESCRIPTION
+#
+#   Check for baseline language coverage in the compiler for the C++0x
+#   standard.
+#
+# LICENSE
+#
+#   Copyright (C) 2008 Benjamin Kosnik <[e-mail]>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.
+
+AC_DEFUN([AC_CXX_COMPILE_STDCXX_0X], [
+  AC_CACHE_CHECK(if g++ supports C++0x features without additional flags,
+  ac_cv_cxx_compile_cxx0x_native,
+  [AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  AC_TRY_COMPILE([
+  template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+    typedef check<check<bool>> right_angle_brackets;
+
+    int a;
+    decltype(a) b;
+
+    typedef check<int> check_type;
+    check_type c;
+    check_type&& cr = c;],,
+  ac_cv_cxx_compile_cxx0x_native=yes, ac_cv_cxx_compile_cxx0x_native=no)
+  AC_LANG_RESTORE
+  ])
+
+  AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x,
+  ac_cv_cxx_compile_cxx0x_cxx,
+  [AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  ac_save_CXXFLAGS="$CXXFLAGS"
+  CXXFLAGS="$CXXFLAGS -std=c++0x"
+  AC_TRY_COMPILE([
+  template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+    typedef check<check<bool>> right_angle_brackets;
+
+    int a;
+    decltype(a) b;
+
+    typedef check<int> check_type;
+    check_type c;
+    check_type&& cr = c;],,
+  ac_cv_cxx_compile_cxx0x_cxx=yes, ac_cv_cxx_compile_cxx0x_cxx=no)
+  CXXFLAGS="$ac_save_CXXFLAGS"
+  AC_LANG_RESTORE
+  ])
+
+  AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x,
+  ac_cv_cxx_compile_cxx0x_gxx,
+  [AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  ac_save_CXXFLAGS="$CXXFLAGS"
+  CXXFLAGS="$CXXFLAGS -std=gnu++0x"
+  AC_TRY_COMPILE([
+  template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+    typedef check<check<bool>> right_angle_brackets;
+
+    int a;
+    decltype(a) b;
+
+    typedef check<int> check_type;
+    check_type c;
+    check_type&& cr = c;],,
+  ac_cv_cxx_compile_cxx0x_gxx=yes, ac_cv_cxx_compile_cxx0x_gxx=no)
+  CXXFLAGS="$ac_save_CXXFLAGS"
+  AC_LANG_RESTORE
+  ])
+
+  if test "$ac_cv_cxx_compile_cxx0x_native" = yes ||
+     test "$ac_cv_cxx_compile_cxx0x_cxx" = yes ||
+     test "$ac_cv_cxx_compile_cxx0x_gxx" = yes; then
+    AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ])
+  fi
+])

=== modified file 'm4/pandora_cstdint.m4'
--- m4/pandora_cstdint.m4	2009-12-18 18:02:39 +0000
+++ m4/pandora_cstdint.m4	2011-04-16 05:39:23 +0000
@@ -1,3 +1,8 @@
+# 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 cstdint. We
 # include AC_TRY_COMPILE for all the combinations we've seen in the
 # wild.  We define one of HAVE_CSTDINT or HAVE_TR1_CSTDINT or 

=== modified file 'm4/pandora_cxx_demangle.m4'
--- m4/pandora_cxx_demangle.m4	2009-12-18 18:02:39 +0000
+++ m4/pandora_cxx_demangle.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 

=== modified file 'm4/pandora_drizzle_build.m4'
--- m4/pandora_drizzle_build.m4	2010-04-06 00:33:06 +0000
+++ m4/pandora_drizzle_build.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 
@@ -9,11 +9,6 @@
 
 AC_DEFUN([PANDORA_DRIZZLE_BUILD],[
 
-  PANDORA_HAVE_CXX_UNORDERED
-
-  PANDORA_CXX_CSTDINT
-  PANDORA_CXX_CINTTYPES
-
   AC_STRUCT_TM
 
   AC_FUNC_ALLOCA
@@ -38,7 +33,7 @@
   AC_CHECK_HEADERS(sys/types.h sys/fpu.h fpu_control.h ieeefp.h)
   AC_CHECK_HEADERS(select.h sys/select.h)
   AC_CHECK_HEADERS(utime.h sys/utime.h )
-  AC_CHECK_HEADERS(synch.h sys/mman.h sys/socket.h)
+  AC_CHECK_HEADERS(synch.h sys/mman.h)
   AC_CHECK_HEADERS(sched.h)
   AC_CHECK_HEADERS(sys/prctl.h)
   AC_CHECK_HEADERS(execinfo.h)
@@ -68,44 +63,20 @@
   ]])
   AC_CHECK_TYPES([uint, ulong])
 
+  PANDORA_REQUIRE_BISON
+
   PANDORA_CXX_DEMANGLE
-  PANDORA_REQUIRE_BOOST([1.32])
-
-
-  AH_TOP([
-#ifndef __CONFIG_H__
-#define __CONFIG_H__
-
-#include "config/top.h"
-])
-  mkdir -p config
-  cat > config/top.h.stamp <<EOF_CONFIG_TOP
-
-#if defined(i386) && !defined(__i386__)
-#define __i386__
-#endif
-
-#if defined(_FILE_OFFSET_BITS)
-# undef _FILE_OFFSET_BITS
-#endif
-EOF_CONFIG_TOP
-  diff config/top.h.stamp config/top.h >/dev/null 2>&1 || mv config/top.h.stamp config/top.h
-  rm -f config/top.h.stamp
-
-
-  AH_BOTTOM([
-#if defined(__cplusplus)
-# include CSTDINT_H
-# include CINTTYPES_H
-#else
-# include <stdint.h>
-# include <inttypes.h>
-#endif
-
-#if !defined(HAVE_ULONG) && !defined(__USE_MISC)
-typedef unsigned long int ulong;
-#endif
-
-#endif /* __CONFIG_H__ */
-  ])
+  PANDORA_REQUIRE_BOOST([1.38])
+  PANDORA_REQUIRE_BOOST_PROGRAM_OPTIONS
+  PANDORA_REQUIRE_BOOST_THREAD
+  PANDORA_REQUIRE_BOOST_REGEX
+  PANDORA_REQUIRE_BOOST_DATE_TIME
+  PANDORA_REQUIRE_BOOST_FILESYSTEM
+  PANDORA_REQUIRE_BOOST_IOSTREAMS
+
+  LIBDRIZZLE_CPPFLAGS="-I\${top_builddir}/libdrizzle-2.0 -I\${top_srcdir}/libdrizzle-2.0"
+  OLDLIBDRIZZLE_CPPFLAGS="-I\${top_builddir}/libdrizzle-1.0 -I\${top_srcdir}/libdrizzle-1.0"
+  AC_SUBST([LIBDRIZZLE_CPPFLAGS])
+  AC_SUBST([OLDLIBDRIZZLE_CPPFLAGS])
+
 ])

=== modified file 'm4/pandora_enable_dtrace.m4'
--- m4/pandora_enable_dtrace.m4	2009-09-29 04:30:01 +0000
+++ m4/pandora_enable_dtrace.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 
@@ -8,32 +8,49 @@
 dnl ---------------------------------------------------------------------------
 AC_DEFUN([PANDORA_ENABLE_DTRACE],[
   AC_ARG_ENABLE([dtrace],
-    [AS_HELP_STRING([--enable-dtrace],
-            [Build with support for the DTRACE. @<:@default=off@:>@])],
-    [ac_cv_enable_dtrace="yes"],
-    [ac_cv_enable_dtrace="no"])
+    [AS_HELP_STRING([--disable-dtrace],
+            [Build with support for the DTRACE. @<:@default=on@:>@])],
+    [ac_cv_enable_dtrace="$enableval"],
+    [ac_cv_enable_dtrace="yes"])
 
   AS_IF([test "$ac_cv_enable_dtrace" = "yes"],[
     AC_CHECK_PROGS([DTRACE], [dtrace])
-    AS_IF([test "x$ac_cv_prog_DTRACE" = "xdtrace"],[
-      AC_DEFINE([HAVE_DTRACE], [1], [Enables DTRACE Support])
-      AC_MSG_CHECKING([if dtrace should instrument object files])
-      dnl DTrace on MacOSX does not use -G option
-      cat >conftest.d <<_ACEOF
-provider Example {
-  probe increment(int);
-};
-_ACEOF
-      $DTRACE -G -o conftest.d.o -s conftest.d 2>/dev/zero
-      AS_IF([test $? -eq 0],[ac_cv_dtrace_needs_objects=yes],
+    AC_CHECK_HEADERS(sys/sdt.h)
+
+    AS_IF([test "x$ac_cv_prog_DTRACE" = "xdtrace" -a "x${ac_cv_header_sys_sdt_h}" = "xyes"],[
+
+      AC_CACHE_CHECK([if dtrace works],[ac_cv_dtrace_works],[
+        cat >conftest.d <<_ACEOF
+provider Example {
+  probe increment(int);
+};
+_ACEOF
+        $DTRACE -h -o conftest.h -s conftest.d 2>/dev/zero
+        AS_IF([test $? -eq 0],[ac_cv_dtrace_works=yes],
+          [ac_cv_dtrace_works=no])
+        rm -f conftest.h conftest.d
+      ])
+      AS_IF([test "x$ac_cv_dtrace_works" = "xyes"],[
+        AC_DEFINE([HAVE_DTRACE], [1], [Enables DTRACE Support])
+      ])
+      AC_CACHE_CHECK([if dtrace should instrument object files],
+        [ac_cv_dtrace_needs_objects],[
+          dnl DTrace on MacOSX does not use -G option
+          cat >conftest.d <<_ACEOF
+provider Example {
+  probe increment(int);
+};
+_ACEOF
+          $DTRACE -G -o conftest.d.o -s conftest.d 2>/dev/zero
+          AS_IF([test $? -eq 0],[ac_cv_dtrace_needs_objects=yes],
             [ac_cv_dtrace_needs_objects=no])
-      rm -f conftest.d.o conftest.d
-      AC_MSG_RESULT($ac_cv_dtrace_needs_objects)
+          rm -f conftest.d.o conftest.d
+      ])
       AC_SUBST(DTRACEFLAGS) dnl TODO: test for -G on OSX
       ac_cv_have_dtrace=yes
     ])])
 
-AM_CONDITIONAL([HAVE_DTRACE], [test "x$ac_cv_have_dtrace" = "xyes"])
+AM_CONDITIONAL([HAVE_DTRACE], [test "x$ac_cv_dtrace_works" = "xyes"])
 AM_CONDITIONAL([DTRACE_NEEDS_OBJECTS],
                [test "x$ac_cv_dtrace_needs_objects" = "xyes"])
 

=== modified file 'm4/pandora_ensure_gcc_version.m4'
--- m4/pandora_ensure_gcc_version.m4	2009-09-29 04:30:01 +0000
+++ m4/pandora_ensure_gcc_version.m4	2011-04-16 05:39:23 +0000
@@ -1,8 +1,22 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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_TRY_GCC],[
+  pushdef([Name],[translit([$1],[./-], [___])])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  AC_CHECK_PROGS([CC]NAME,[gcc$1])
+  AC_CHECK_PROGS([CXX]NAME,[g++$1])
+  AS_IF([test "x${CC]NAME[}" != "x" -a "x${ac_cv_env_CC_set}" = "x"],
+    [CC="${CC]NAME[}"])
+  AS_IF([test "x${CXX]NAME[}" != "x" -a "x${ac_cv_env_CCX_set}" = "x"],
+    [CXX="${CXX]NAME[}"])
+  AS_IF([test "x${CC]NAME[}" != "x" -a "x${ac_cv_env_CPP_set}" = "x"],
+    [CPP="${CC]NAME[} -E"])
+])
+
 dnl If the user is on a Mac and didn't ask for a specific compiler
 dnl You're gonna get 4.2.
 AC_DEFUN([PANDORA_MAC_GCC42],
@@ -10,30 +24,39 @@
     AS_IF([test "$host_vendor" = "apple" -a "x${ac_cv_env_CC_set}" = "x"],[
       host_os_version=`echo ${host_os} | perl -ple 's/^\D+//g;s,\..*,,'`
       AS_IF([test "$host_os_version" -lt 10],[
-        AS_IF([test -f /usr/bin/gcc-4.2],
-        [
-          CPP="/usr/bin/gcc-4.2 -E"
-          CC=/usr/bin/gcc-4.2
-          CXX=/usr/bin/g++-4.2
-        ])
+        _PANDORA_TRY_GCC([-4.2])
       ])
     ])
   ])
 ])
 
+dnl If the user is on CentOS or RHEL and didn't ask for a specific compiler
+dnl You're gonna get 4.4 (forward compatible with 4.5)
+AC_DEFUN([PANDORA_RH_GCC44],
+  [AS_IF([test "$GCC" = "yes"],[
+    AS_IF([test "x${ac_cv_env_CC_set}" = "x"],[
+      _PANDORA_TRY_GCC([44])
+      _PANDORA_TRY_GCC([45])
+    ])
+  ])
+])
+
 dnl 
 AC_DEFUN([PANDORA_ENSURE_GCC_VERSION],[
   AC_REQUIRE([PANDORA_MAC_GCC42])
-  AC_CACHE_CHECK([if GCC is recent enough], [ac_cv_gcc_recent],
-    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#if !defined(__GNUC__) || (__GNUC__ < 4) || ((__GNUC__ >= 4) && (__GNUC_MINOR__ < 1))
+  AC_REQUIRE([PANDORA_RH_GCC44])
+  AS_IF([test "$GCC" = "yes"],[
+    AC_CACHE_CHECK([if GCC is recent enough], [ac_cv_gcc_recent],
+      [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#if !defined(__GNUC__) || (__GNUC__ < 4) || ((__GNUC__ >= 4) && (__GNUC_MINOR__ < 2))
 # error GCC is Too Old!
 #endif
-      ]])],
-      [ac_cv_gcc_recent=yes],
-      [ac_cv_gcc_recent=no])])
-  AS_IF([test "$ac_cv_gcc_recent" = "no" -a "$host_vendor" = "apple"],
-    AC_MSG_ERROR([Your version of GCC is too old. At least version 4.2 is required on OSX. You may need to install a version of XCode >= 3.1.2]))
-  AS_IF([test "$ac_cv_gcc_recent" = "no"],
-    AC_MSG_ERROR([Your version of GCC is too old. At least version 4.1 is required]))
+        ]])],
+        [ac_cv_gcc_recent=yes],
+        [ac_cv_gcc_recent=no])])
+    AS_IF([test "$ac_cv_gcc_recent" = "no" -a "$host_vendor" = "apple"],
+      PANDORA_MSG_ERROR([Your version of GCC is too old. At least version 4.2 is required on OSX. You may need to install a version of XCode >= 3.1.2]))
+    AS_IF([test "$ac_cv_gcc_recent" = "no"],
+      PANDORA_MSG_ERROR([Your version of GCC is too old. At least version 4.2 is required. On RHEL/CentOS systems this is found in the gcc44 and gcc44-c++ packages.]))
+  ])
 ])

=== modified file 'm4/pandora_extensions.m4'
--- m4/pandora_extensions.m4	2009-09-29 04:30:01 +0000
+++ m4/pandora_extensions.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 

=== modified file 'm4/pandora_fdatasync.m4'
--- m4/pandora_fdatasync.m4	2010-04-06 00:33:06 +0000
+++ m4/pandora_fdatasync.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 

=== added file 'm4/pandora_flex.m4'
--- m4/pandora_flex.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_flex.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,33 @@
+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"],
+      PANDORA_MSG_ERROR(["flex is required for ${PACKAGE} to build from a bzr branch"])
+      )
+])

=== modified file 'm4/pandora_have_better_malloc.m4'
--- m4/pandora_have_better_malloc.m4	2010-01-13 10:48:24 +0000
+++ m4/pandora_have_better_malloc.m4	2011-04-16 05:39:23 +0000
@@ -1,11 +1,9 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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_HAVE_BETTER_MALLOC],[
-  AC_REQUIRE([AC_FUNC_MALLOC])
-  AC_REQUIRE([AC_FUNC_REALLOC])
   AC_REQUIRE([AC_LIB_PREFIX])
 
   AC_ARG_ENABLE([umem],

=== added file 'm4/pandora_have_boost.m4'
--- m4/pandora_have_boost.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_boost.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,93 @@
+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],
+      PANDORA_MSG_ERROR([boost is required for ${PACKAGE}]))
+])
+

=== modified file 'm4/pandora_have_gcc_atomics.m4'
--- m4/pandora_have_gcc_atomics.m4	2010-04-06 00:33:06 +0000
+++ m4/pandora_have_gcc_atomics.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 

=== added file 'm4/pandora_have_libaio.m4'
--- m4/pandora_have_libaio.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_libaio.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,56 @@
+dnl  Copyright (C) 2011 Andrew Hutchings
+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 libaio
+#--------------------------------------------------------------------
+
+
+AC_DEFUN([_PANDORA_SEARCH_LIBAIO],[
+  AC_REQUIRE([AC_LIB_PREFIX])
+
+  AC_CHECK_HEADERS(libaio.h)
+  AC_LIB_HAVE_LINKFLAGS(aio,,
+  [
+    #include <libaio.h>
+  ],
+  [
+    int aio_cmd= IO_CMD_PREAD;
+  ])
+
+  AM_CONDITIONAL(HAVE_LIBAIO, [test "x${ac_cv_libaio}" = "xyes"])
+
+  AS_IF([test "x${ac_cv_libaio}" = "xyes"],[
+    AC_DEFINE([LINUX_NATIVE_AIO], [1], [Enabel libaio support in InnoDB])
+  ])
+])
+
+AC_DEFUN([_PANDORA_HAVE_LIBAIO],[
+
+  AC_ARG_ENABLE([libaio],
+    [AS_HELP_STRING([--disable-libaio],
+      [Build with libaio support @<:@default=on@:>@])],
+    [ac_enable_libaio="$enableval"],
+    [ac_enable_libaio="yes"])
+
+  _PANDORA_SEARCH_LIBAIO
+])
+
+
+AC_DEFUN([PANDORA_HAVE_LIBAIO],[
+  AC_REQUIRE([_PANDORA_HAVE_LIBAIO])
+])
+
+AC_DEFUN([_PANDORA_REQUIRE_LIBAIO],[
+  ac_enable_libaio="yes"
+  _PANDORA_SEARCH_LIBAIO
+  AS_IF([test "x$ac_cv_header_libaio_h" = "xno"],[
+    PANDORA_MSG_ERROR([Couldn't find libaio.h. On Debian this can be found in libaio-dev. On Redhat this can be found in libaio-devel.])
+  ])
+])
+
+AC_DEFUN([PANDORA_REQUIRE_LIBAIO],[
+  AC_REQUIRE([_PANDORA_REQUIRE_LIBAIO])
+])

=== modified file 'm4/pandora_have_libavahi.m4'
--- m4/pandora_have_libavahi.m4	2009-12-18 18:02:39 +0000
+++ m4/pandora_have_libavahi.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 
@@ -37,5 +37,5 @@
 AC_DEFUN([PANDORA_REQUIRE_LIBAVAHI],[
   AC_REQUIRE([_PANDORA_SEARCH_LIBAVAHI])
   AS_IF([test "x${ac_cv_libavahi}" = "xno"],
-    AC_MSG_ERROR([libavahi is required for ${PACKAGE}]))
+    PANDORA_MSG_ERROR([libavahi is required for ${PACKAGE}]))
 ])

=== modified file 'm4/pandora_have_libbdb.m4'
--- m4/pandora_have_libbdb.m4	2009-12-18 18:02:39 +0000
+++ m4/pandora_have_libbdb.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 
@@ -36,5 +36,5 @@
 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}]))
+    PANDORA_MSG_ERROR([libbdb is required for ${PACKAGE}]))
 ])

=== added file 'm4/pandora_have_libboost_date_time.m4'
--- m4/pandora_have_libboost_date_time.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_libboost_date_time.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,46 @@
+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_DATE_TIME],[
+  AC_REQUIRE([AC_LIB_PREFIX])
+  AC_REQUIRE([ACX_PTHREAD])
+
+  dnl --------------------------------------------------------------------
+  dnl  Check for Boost.Date_Time
+  dnl --------------------------------------------------------------------
+
+  AC_LANG_PUSH(C++)
+  AC_LIB_HAVE_LINKFLAGS(boost_date_time-mt,,[
+    #include <boost/date_time.hpp>
+  ],[
+    boost::gregorian::date weekstart(2002,2,1);
+  ])
+  AS_IF([test "x${ac_cv_libboost_date_time_mt}" = "xno"],[
+    AC_LIB_HAVE_LINKFLAGS(boost_date_time,,[
+      #include <boost/date_time.hpp>
+    ],[
+      boost::gregorian::date weekstart(2002,2,1);
+    ])
+  ])
+  AC_LANG_POP()
+  
+  AM_CONDITIONAL(HAVE_BOOST_DATE_TIME,
+    [test "x${ac_cv_libboost_date_time}" = "xyes" -o "x${ac_cv_libboost_date_time_mt}" = "xyes"])
+  BOOST_LIBS="${BOOST_LIBS} ${LTLIBBOOST_DATE_TIME_MT} ${LTLIBBOOST_DATE_TIME}"
+  AC_SUBST(BOOST_LIBS) 
+])
+
+AC_DEFUN([PANDORA_HAVE_BOOST_DATE_TIME],[
+  PANDORA_HAVE_BOOST($1)
+  _PANDORA_SEARCH_BOOST_DATE_TIME($1)
+])
+
+AC_DEFUN([PANDORA_REQUIRE_BOOST_DATE_TIME],[
+  PANDORA_REQUIRE_BOOST($1)
+  _PANDORA_SEARCH_BOOST_DATE_TIME($1)
+  AS_IF([test "x${ac_cv_libboost_date_time}" = "xno" -a "x${ac_cv_libboost_date_time_mt}" = "xno"],
+      PANDORA_MSG_ERROR([Boost.Date_Time is required for ${PACKAGE}]))
+])
+

=== added file 'm4/pandora_have_libboost_filesystem.m4'
--- m4/pandora_have_libboost_filesystem.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_libboost_filesystem.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,48 @@
+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_FILESYSTEM],[
+  AC_REQUIRE([AC_LIB_PREFIX])
+
+  dnl --------------------------------------------------------------------
+  dnl  Check for Boost.Filesystem
+  dnl --------------------------------------------------------------------
+
+  AC_LANG_PUSH(C++)
+  AC_DEFINE([BOOST_FILESYSTEM_DEPRECATED], [1],
+            [Use the v2 interface until we can stop using old versions])
+
+  AC_LIB_HAVE_LINKFLAGS(boost_filesystem-mt,boost_system-mt,[
+    #include <boost/filesystem.hpp>
+  ],[
+    boost::filesystem::path my_path("some_dir/file.txt");
+  ])
+  AS_IF([test "x${ac_cv_libboost_filesystem_mt}" = "xno"],[
+    AC_LIB_HAVE_LINKFLAGS(boost_filesystem,boost_system,[
+      #include <boost/filesystem.hpp>
+    ],[
+      boost::filesystem::path my_path("some_dir/file.txt");
+    ])
+  ])
+  AC_LANG_POP()
+  
+  AM_CONDITIONAL(HAVE_BOOST_FILESYSTEM,
+    [test "x${ac_cv_libboost_filesystem}" = "xyes" -o "x${ac_cv_libboost_filesystem_mt}" = "xyes"])
+  BOOST_LIBS="${BOOST_LIBS} ${LTLIBBOOST_FILESYSTEM_MT} ${LTLIBBOOST_FILESYSTEM}"
+  AC_SUBST(BOOST_LIBS) 
+])
+
+AC_DEFUN([PANDORA_HAVE_BOOST_FILESYSTEM],[
+  PANDORA_HAVE_BOOST($1)
+  _PANDORA_SEARCH_BOOST_FILESYSTEM($1)
+])
+
+AC_DEFUN([PANDORA_REQUIRE_BOOST_FILESYSTEM],[
+  PANDORA_REQUIRE_BOOST($1)
+  _PANDORA_SEARCH_BOOST_FILESYSTEM($1)
+  AS_IF([test "x${ac_cv_libboost_filesystem}" = "xno" -a "x${ac_cv_libboost_filesystem_mt}" = "xno"],
+      PANDORA_MSG_ERROR([Boost.Filesystem is required for ${PACKAGE}]))
+])
+

=== added file 'm4/pandora_have_libboost_iostreams.m4'
--- m4/pandora_have_libboost_iostreams.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_libboost_iostreams.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,49 @@
+dnl Copyright (C) 2010 Andrew Hutchings
+dnl This file is free software; Andrew Hutchings
+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_IOSTREAMS],[
+  AC_REQUIRE([AC_LIB_PREFIX])
+
+  dnl --------------------------------------------------------------------
+  dnl  Check for Boost.Iostreams
+  dnl --------------------------------------------------------------------
+
+  AC_LANG_PUSH(C++)
+  AC_LIB_HAVE_LINKFLAGS(boost_iostreams-mt,,[
+    #include <boost/iostreams/stream.hpp>
+    #include <boost/iostreams/device/array.hpp>
+  ],[
+    const char* input= "hello world";
+    boost::iostreams::stream<boost::iostreams::array_source> in(input, strlen(input));
+  ])
+  AS_IF([test "x${ac_cv_libboost_iostreams_mt}" = "xno"],[
+    AC_LIB_HAVE_LINKFLAGS(boost_iostreams,,[
+      #include <boost/iostreams/stream.hpp>
+      #include <boost/iostreams/device/array.hpp>
+    ],[
+      const char* input= "hello world";
+      boost::iostreams::stream<boost::iostreams::array_source> in(input, strlen(input));
+    ])
+  ])
+  AC_LANG_POP()
+  
+  AM_CONDITIONAL(HAVE_BOOST_IOSTREAMS,
+    [test "x${ac_cv_libboost_iostreams}" = "xyes" -o "x${ac_cv_libboost_iostreams_mt}" = "xyes"])
+  BOOST_LIBS="${BOOST_LIBS} ${LTLIBBOOST_IOSTREAMS_MT} ${LTLIBBOOST_IOSTREAMS}"
+  AC_SUBST(BOOST_LIBS) 
+])
+
+AC_DEFUN([PANDORA_HAVE_BOOST_IOSTREAMS],[
+  PANDORA_HAVE_BOOST($1)
+  _PANDORA_SEARCH_BOOST_IOSTREAMS($1)
+])
+
+AC_DEFUN([PANDORA_REQUIRE_BOOST_IOSTREAMS],[
+  PANDORA_REQUIRE_BOOST($1)
+  _PANDORA_SEARCH_BOOST_IOSTREAMS($1)
+  AS_IF([test "x${ac_cv_libboost_iostreams}" = "xno" -a "x${ac_cv_libboost_iostreams_mt}" = "xno"],
+      PANDORA_MSG_ERROR([Boost.Iostreams is required for ${PACKAGE}]))
+])
+

=== added file 'm4/pandora_have_libboost_options.m4'
--- m4/pandora_have_libboost_options.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_libboost_options.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,47 @@
+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_PROGRAM_OPTIONS],[
+  AC_REQUIRE([AC_LIB_PREFIX])
+
+  dnl --------------------------------------------------------------------
+  dnl  Check for boost::program_options
+  dnl --------------------------------------------------------------------
+
+  AC_LANG_PUSH(C++)
+  AC_LIB_HAVE_LINKFLAGS(boost_program_options-mt,,[
+    #include <boost/program_options.hpp>
+  ],[
+    boost::program_options::options_description d;
+    d.add_options()("a","some option");
+  ])
+  AS_IF([test "x${ac_cv_libboost_program_options_mt}" = "xno"],[
+    AC_LIB_HAVE_LINKFLAGS(boost_program_options,,[
+      #include <boost/program_options.hpp>
+    ],[
+      boost::program_options::options_description d;
+      d.add_options()("a","some option");
+    ])
+  ])
+  AC_LANG_POP()
+  
+  AM_CONDITIONAL(HAVE_BOOST_PROGRAM_OPTIONS,
+    [test "x${ac_cv_libboost_program_options}" = "xyes" -o "x${ac_cv_libboost_program_options_mt}" = "xyes"])
+  BOOST_LIBS="${BOOST_LIBS} ${LTLIBBOOST_PROGRAM_OPTIONS} ${LTLIBBOOST_PROGRAM_OPTIONS_MT}"
+  AC_SUBST(BOOST_LIBS) 
+])
+
+AC_DEFUN([PANDORA_HAVE_BOOST_PROGRAM_OPTIONS],[
+  PANDORA_HAVE_BOOST($1)
+  _PANDORA_SEARCH_BOOST_PROGRAM_OPTIONS($1)
+])
+
+AC_DEFUN([PANDORA_REQUIRE_BOOST_PROGRAM_OPTIONS],[
+  PANDORA_REQUIRE_BOOST($1)
+  _PANDORA_SEARCH_BOOST_PROGRAM_OPTIONS($1)
+  AS_IF([test "x${ac_cv_libboost_program_options}" = "xno" -a "x${ac_cv_libboost_program_options_mt}" = "xno"],
+      PANDORA_MSG_ERROR([boost::program_options is required for ${PACKAGE}]))
+])
+

=== added file 'm4/pandora_have_libboost_regex.m4'
--- m4/pandora_have_libboost_regex.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_libboost_regex.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,54 @@
+dnl Copyright (C) 2010 Andrew Hutchings
+dnl This file is free software; Andrew Hutchings
+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_REGEX],[
+  AC_REQUIRE([AC_LIB_PREFIX])
+  AC_REQUIRE([ACX_PTHREAD])
+
+  dnl --------------------------------------------------------------------
+  dnl  Check for boost::regex
+  dnl --------------------------------------------------------------------
+
+  save_CFLAGS="${CFLAGS}"
+  save_CXXFLAGS="${CXXFLAGS}"
+  CFLAGS="${PTHREAD_CFLAGS} ${CFLAGS}"
+  CXXFLAGS="${PTHREAD_CFLAGS} ${CXXFLAGS}"
+
+  AC_LANG_PUSH(C++)
+  AC_LIB_HAVE_LINKFLAGS(boost_regex-mt,,[
+    #include <boost/regex.hpp>
+  ],[
+    boost::regex test_regex("drizzle");
+  ])
+  AS_IF([test "x${ac_cv_libboost_regex_mt}" = "xno"],[
+    AC_LIB_HAVE_LINKFLAGS(boost_regex,,[
+      #include <boost/regex.hpp>
+    ],[
+      boost::regex test_regex("drizzle");
+    ])
+  ])
+  AC_LANG_POP()
+  CFLAGS="${save_CFLAGS}"
+  CXXFLAGS="${save_CXXFLAGS}"
+
+  
+  AM_CONDITIONAL(HAVE_BOOST_REGEX,
+    [test "x${ac_cv_libboost_regex}" = "xyes" -o "x${ac_cv_libboost_regex_mt}" = "xyes"])
+  BOOST_LIBS="${BOOST_LIBS} ${LTLIBBOOST_REGEX_MT} ${LTLIBBOOST_REGEX}"
+  AC_SUBST(BOOST_LIBS) 
+])
+
+AC_DEFUN([PANDORA_HAVE_BOOST_REGEX],[
+  PANDORA_HAVE_BOOST($1)
+  _PANDORA_SEARCH_BOOST_REGEX($1)
+])
+
+AC_DEFUN([PANDORA_REQUIRE_BOOST_REGEX],[
+  PANDORA_REQUIRE_BOOST($1)
+  _PANDORA_SEARCH_BOOST_REGEX($1)
+  AS_IF([test "x${ac_cv_libboost_regex}" = "xno" -a "x${ac_cv_libboost_regex_mt}" = "xno"],
+      PANDORA_MSG_ERROR([boost::regex is required for ${PACKAGE}]))
+])
+

=== added file 'm4/pandora_have_libboost_test.m4'
--- m4/pandora_have_libboost_test.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_libboost_test.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,45 @@
+dnl Copyright (C) 2011 Andrew Hutchings
+dnl This file is free software; Andrew Hutchings
+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_TEST],[
+  AC_REQUIRE([AC_LIB_PREFIX])
+
+  dnl --------------------------------------------------------------------
+  dnl  Check for boost::test
+  dnl --------------------------------------------------------------------
+
+  AC_LANG_PUSH(C++)
+  AC_LIB_HAVE_LINKFLAGS(boost_unit_test_framework-mt,,[
+    #include <boost/test/unit_test.hpp>
+  ],[
+    boost::unit_test::unit_test_log.set_threshold_level(boost::unit_test::log_messages);
+  ])
+  AS_IF([test "x${ac_cv_libboost_unit_test_framework_mt}" = "xno"],[
+    AC_LIB_HAVE_LINKFLAGS(boost_unit_test_framework,,[
+      #include <boost/test/unit_test.hpp>
+    ],[
+      boost::unit_test::unit_test_log.set_threshold_level(boost::unit_test::log_messages);
+    ])
+  ])
+  AC_LANG_POP()
+  
+  AM_CONDITIONAL(HAVE_BOOST_TEST,
+    [test "x${ac_cv_libboost_unit_test_framework}" = "xyes" -o "x${ac_cv_libboost_unit_test_framework_mt}" = "xyes"])
+  BOOST_LIBS="${BOOST_LIBS} ${LTLIBBOOST_TEST_MT} ${LTLIBBOOST_TEST}"
+  AC_SUBST(BOOST_LIBS) 
+])
+
+AC_DEFUN([PANDORA_HAVE_BOOST_TEST],[
+  PANDORA_HAVE_BOOST($1)
+  _PANDORA_SEARCH_BOOST_TEST($1)
+])
+
+AC_DEFUN([PANDORA_REQUIRE_BOOST_TEST],[
+  PANDORA_REQUIRE_BOOST($1)
+  _PANDORA_SEARCH_BOOST_TEST($1)
+  AS_IF([test "x${ac_cv_libboost_unit_test_framework}" = "xno" -a "x${ac_cv_libboost_unit_test_framework_mt}" = "xno"],
+      PANDORA_MSG_ERROR([boost::test is required for ${PACKAGE}]))
+])
+

=== added file 'm4/pandora_have_libboost_thread.m4'
--- m4/pandora_have_libboost_thread.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_libboost_thread.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,54 @@
+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_THREAD],[
+  AC_REQUIRE([AC_LIB_PREFIX])
+  AC_REQUIRE([ACX_PTHREAD])
+
+  dnl --------------------------------------------------------------------
+  dnl  Check for boost::thread
+  dnl --------------------------------------------------------------------
+
+  save_CFLAGS="${CFLAGS}"
+  save_CXXFLAGS="${CXXFLAGS}"
+  CFLAGS="${PTHREAD_CFLAGS} ${CFLAGS}"
+  CXXFLAGS="${PTHREAD_CFLAGS} ${CXXFLAGS}"
+
+  AC_LANG_PUSH(C++)
+  AC_LIB_HAVE_LINKFLAGS(boost_thread-mt,,[
+    #include <boost/thread.hpp>
+  ],[
+    boost::thread id;
+  ])
+  AS_IF([test "x${ac_cv_libboost_thread_mt}" = "xno"],[
+    AC_LIB_HAVE_LINKFLAGS(boost_thread,,[
+      #include <boost/thread.hpp>
+    ],[
+      boost::thread id;
+    ])
+  ])
+  AC_LANG_POP()
+  CFLAGS="${save_CFLAGS}"
+  CXXFLAGS="${save_CXXFLAGS}"
+
+  
+  AM_CONDITIONAL(HAVE_BOOST_THREAD,
+    [test "x${ac_cv_libboost_thread}" = "xyes" -o "x${ac_cv_libboost_thread_mt}" = "xyes"])
+  BOOST_LIBS="${BOOST_LIBS} ${LTLIBBOOST_THREAD_MT} ${LTLIBBOOST_THREAD}"
+  AC_SUBST(BOOST_LIBS) 
+])
+
+AC_DEFUN([PANDORA_HAVE_BOOST_THREAD],[
+  PANDORA_HAVE_BOOST($1)
+  _PANDORA_SEARCH_BOOST_THREAD($1)
+])
+
+AC_DEFUN([PANDORA_REQUIRE_BOOST_THREAD],[
+  PANDORA_REQUIRE_BOOST($1)
+  _PANDORA_SEARCH_BOOST_THREAD($1)
+  AS_IF([test "x${ac_cv_libboost_thread}" = "xno" -a "x${ac_cv_libboost_thread_mt}" = "xno"],
+      PANDORA_MSG_ERROR([boost::thread is required for ${PACKAGE}]))
+])
+

=== modified file 'm4/pandora_have_libcassandra.m4'
--- m4/pandora_have_libcassandra.m4	2010-04-06 00:33:06 +0000
+++ m4/pandora_have_libcassandra.m4	2011-04-16 05:39:23 +0000
@@ -39,6 +39,6 @@
 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}])
+      PANDORA_MSG_ERROR([libcassandra is required for ${PACKAGE}])
   ])
 ])

=== added file 'm4/pandora_have_libcurl.m4'
--- m4/pandora_have_libcurl.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_libcurl.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,62 @@
+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"],[
+    PANDORA_MSG_ERROR([libcurl is required for ${PACKAGE}])
+  ])
+])

=== modified file 'm4/pandora_have_libdl.m4'
--- m4/pandora_have_libdl.m4	2010-01-13 10:48:24 +0000
+++ m4/pandora_have_libdl.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 
@@ -42,7 +42,7 @@
   _PANDORA_SEARCH_LIBDL
 
   AS_IF([test "$ac_cv_func_dlopen" != "yes"],[
-    AC_MSG_ERROR([libdl/dlopen() is required for ${PACKAGE}. On Debian this can be found in libc6-dev. On RedHat this can be found in glibc-devel.])
+    PANDORA_MSG_ERROR([libdl/dlopen() is required for ${PACKAGE}. On Debian this can be found in libc6-dev. On RedHat this can be found in glibc-devel.])
   ])
 ])
 

=== modified file 'm4/pandora_have_libdrizzle.m4'
--- m4/pandora_have_libdrizzle.m4	2010-04-06 00:33:06 +0000
+++ m4/pandora_have_libdrizzle.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 
@@ -27,6 +27,15 @@
     ac_cv_libdrizzle="no"
   ])
   
+  AS_IF([test "${ac_cv_libdrizzle}" = "no" -a "${ac_enable_libdrizzle}" = "yes"],[
+
+    PKG_CHECK_MODULES([LIBDRIZZLE], [libdrizzle-1.0], [
+      ac_cv_libdrizzle=yes
+      LTLIBDRIZZLE=${LIBDRIZZLE_LIBS}
+      LIBDRIZZLE=${LIBDRIZZLE_LIBS}
+    ],[test x = y])
+  ])
+
   AM_CONDITIONAL(HAVE_LIBDRIZZLE, [test "x${ac_cv_libdrizzle}" = "xyes"])
 ])
 
@@ -37,7 +46,7 @@
 AC_DEFUN([PANDORA_REQUIRE_LIBDRIZZLE],[
   AC_REQUIRE([PANDORA_HAVE_LIBDRIZZLE])
   AS_IF([test "x${ac_cv_libdrizzle}" = "xno"],[
-    AC_MSG_ERROR([libdrizzle is required for ${PACKAGE}])
+    PANDORA_MSG_ERROR([libdrizzle is required for ${PACKAGE}])
   ],[
     dnl We need at least 0.8 on Solaris non-sparc
     AS_IF([test "$target_cpu" != "sparc" -a "x${TARGET_SOLARIS}" = "xtrue"],[
@@ -56,6 +65,6 @@
     [pandora_cv_libdrizzle_recent=yes],
     [pandora_cv_libdrizzle_recent=no])])
   AS_IF([test "$pandora_cv_libdrizzle_recent" = "no"],[
-    AC_MSG_ERROR([Your version of libdrizzle is too old. ${PACKAGE} requires at least version 0.8])
+    PANDORA_MSG_ERROR([Your version of libdrizzle is too old. ${PACKAGE} requires at least version 0.8])
   ])
 ])

=== modified file 'm4/pandora_have_libevent.m4'
--- m4/pandora_have_libevent.m4	2009-12-18 18:02:39 +0000
+++ m4/pandora_have_libevent.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 
@@ -57,7 +57,7 @@
   _PANDORA_SEARCH_LIBEVENT
 
   AS_IF([test x$ac_cv_libevent = xno],[
-    AC_MSG_ERROR([libevent is required for ${PACKAGE}. On Debian this can be found in libevent-dev. On RedHat this can be found in libevent-devel.])
+    PANDORA_MSG_ERROR([libevent is required for ${PACKAGE}. On Debian this can be found in libevent-dev. On RedHat this can be found in libevent-devel.])
   ])
 ])
 

=== modified file 'm4/pandora_have_libgearman.m4'
--- m4/pandora_have_libgearman.m4	2009-12-18 19:25:00 +0000
+++ m4/pandora_have_libgearman.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 
@@ -37,5 +37,5 @@
 AC_DEFUN([PANDORA_REQUIRE_LIBGEARMAN],[
   AC_REQUIRE([PANDORA_HAVE_LIBGEARMAN])
   AS_IF([test "x${ac_cv_libgearman}" = "xno"],
-      AC_MSG_ERROR([At least version 0.10 of libgearman is required for ${PACKAGE}]))
+      PANDORA_MSG_ERROR([At least version 0.10 of libgearman is required for ${PACKAGE}]))
 ])

=== added file 'm4/pandora_have_libgtest.m4'
--- m4/pandora_have_libgtest.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_libgtest.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,47 @@
+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_LIBGTEST],[
+  AC_REQUIRE([AC_LIB_PREFIX])
+
+  dnl --------------------------------------------------------------------
+  dnl  Check for libgtest
+  dnl --------------------------------------------------------------------
+
+  AC_ARG_ENABLE([libgtest],
+    [AS_HELP_STRING([--disable-libgtest],
+      [Build with libgtest support @<:@default=on@:>@])],
+    [ac_enable_libgtest="$enableval"],
+    [ac_enable_libgtest="yes"])
+
+  AS_IF([test "x$ac_enable_libgtest" = "xyes"],[
+    AC_LANG_PUSH(C++)
+    save_CXXFLAGS="${CXXFLAGS}"
+    CXXFLAGS="${AM_CXXFLAGS} ${CXXFLAGS}"
+    AC_LIB_HAVE_LINKFLAGS(gtest,,[
+      #include <gtest/gtest.h>
+TEST(pandora_test_libgtest, PandoraTest)
+{
+  ASSERT_EQ(1, 1);
+}
+    ],[])
+    CXXFLAGS="${save_CXXFLAGS}"
+    AC_LANG_POP()
+  ],[
+    ac_cv_libgtest="no"
+  ])
+
+  AM_CONDITIONAL(HAVE_LIBGTEST, [test "x${ac_cv_libgtest}" = "xyes"])
+])
+
+AC_DEFUN([PANDORA_HAVE_LIBGTEST],[
+  AC_REQUIRE([_PANDORA_SEARCH_LIBGTEST])
+])
+
+AC_DEFUN([PANDORA_REQUIRE_LIBGTEST],[
+  AC_REQUIRE([_PANDORA_SEARCH_LIBGTEST])
+  AS_IF([test "x${ac_cv_libgtest}" = "xno"],
+    PANDORA_MSG_ERROR([libgtest is required for ${PACKAGE}]))
+])

=== added file 'm4/pandora_have_libhaildb.m4'
--- m4/pandora_have_libhaildb.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_libhaildb.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,43 @@
+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_LIBHAILDB],[
+  AC_REQUIRE([AC_LIB_PREFIX])
+
+  dnl --------------------------------------------------------------------
+  dnl  Check for libhaildb
+  dnl --------------------------------------------------------------------
+
+  AC_ARG_ENABLE([libhaildb],
+    [AS_HELP_STRING([--disable-libhaildb],
+      [Build with libhaildb support @<:@default=on@:>@])],
+    [ac_enable_libhaildb="$enableval"],
+    [ac_enable_libhaildb="yes"])
+
+
+  AS_IF([test "x$ac_enable_libhaildb" = "xyes"],[
+    AC_LIB_HAVE_LINKFLAGS(haildb,,[
+      #include <haildb.h>
+    ],[
+      ib_update_table_statistics(NULL);
+    ])
+    AS_IF([test "x${ac_cv_libhaildb}" = "xyes"],[
+      AC_DEFINE([HAVE_HAILDB_H],[1],[Do we have haildb.h])
+      ])
+  ],[
+    ac_cv_libhaildb="no"
+  ])
+  AM_CONDITIONAL(HAVE_LIBHAILDB, [test "x${ac_cv_libhaildb}" = "xyes"])
+])
+
+AC_DEFUN([PANDORA_HAVE_LIBHAILDB],[
+  AC_REQUIRE([_PANDORA_SEARCH_LIBHAILDB])
+])
+
+AC_DEFUN([PANDORA_REQUIRE_LIBHAILDB],[
+  AC_REQUIRE([PANDORA_HAVE_LIBHAILDB])
+  AS_IF([test "x${ac_cv_libhaildb}" = "xno"],
+      PANDORA_MSG_ERROR([libhaildb 2.3.2 or later is required for ${PACKAGE}]))
+])

=== added file 'm4/pandora_have_libhashkit.m4'
--- m4/pandora_have_libhashkit.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_libhashkit.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,42 @@
+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],
+      PANDORA_MSG_ERROR([libhashkit is required for ${PACKAGE}]))
+])

=== added file 'm4/pandora_have_libldap.m4'
--- m4/pandora_have_libldap.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_libldap.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,73 @@
+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],[
+    PANDORA_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])
+])

=== modified file 'm4/pandora_have_libmemcached.m4'
--- m4/pandora_have_libmemcached.m4	2011-02-14 23:35:15 +0000
+++ m4/pandora_have_libmemcached.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 
@@ -11,15 +11,27 @@
   dnl --------------------------------------------------------------------
 
   AC_ARG_ENABLE([libmemcached],
-    [AS_HELP_STRING([--enable-libmemcached],
-      [Build with libmemcached support @<:@default=off@:>@])],
+    [AS_HELP_STRING([--disable-libmemcached],
+      [Build with libmemcached support @<:@default=on@:>@])],
     [ac_enable_libmemcached="$enableval"],
-    [ac_enable_libmemcached="no"])
+    [ac_enable_libmemcached="yes"])
 
   AS_IF([test "x$ac_enable_libmemcached" = "xyes"],[
+
+    AS_IF([test "x$pandora_check_libmemcached_version" != "x"],[
+      pandora_need_libmemcached_version=`echo "$pandora_check_libmemcached_version" | perl -nle '/(\d+)\.(\d+)/; printf "%d%0.3d000", $[]1, $[]2 ;'`
+      ],[
+      pandora_need_libmemcached_version=000000
+      ])
+
     AC_LIB_HAVE_LINKFLAGS(memcached,,[
       #include <libmemcached/memcached.h>
+      #include <libmemcached/configure.h>
+      #if !defined(LIBMEMCACHED_VERSION_HEX) || LIBMEMCACHED_VERSION_HEX < 0x]${pandora_need_libmemcached_version}[
+      # error libmemcached too old!
+      #endif
     ],[
+
       memcached_st memc;
       memcached_dump_func *df;
       memcached_lib_version();
@@ -51,56 +63,20 @@
   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"])
+
+  AM_CONDITIONAL(HAVE_LIBMEMCACHED,[test "x${ac_cv_libmemcached}" = "xyes"])
   
 ])
 
 AC_DEFUN([PANDORA_HAVE_LIBMEMCACHED],[
-  AC_REQUIRE([_PANDORA_SEARCH_LIBMEMCACHED])
-  _PANDORA_RECENT_LIBMEMCACHED($1)
+  pandora_check_libmemcached_version=$1
+  _PANDORA_SEARCH_LIBMEMCACHED
 ])
 
 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}]))
 ])

=== modified file 'm4/pandora_have_libmysqlclient.m4'
--- m4/pandora_have_libmysqlclient.m4	2010-01-28 21:58:37 +0000
+++ m4/pandora_have_libmysqlclient.m4	2011-04-16 05:39:23 +0000
@@ -68,7 +68,7 @@
 AC_DEFUN([PANDORA_REQUIRE_LIBMYSQLCLIENT],[
   AC_REQUIRE([PANDORA_HAVE_LIBMYSQLCLIENT])
   AS_IF([test "x${ac_cv_libmysqlclient_r}" = "xno"],
-      AC_MSG_ERROR([libmysqlclient_r is required for ${PACKAGE}]))
+      PANDORA_MSG_ERROR([libmysqlclient_r is required for ${PACKAGE}]))
 ])
 
   AS_IF([test "x$MYSQL_CONFIG" = "xISDIR"],[
@@ -102,20 +102,20 @@
     MYSQL_INCLUDES="$IBASE $ADDIFLAGS"   
 
     
-    dnl AC_CHECK_LIB([mysqlclient_r],[safe_mutex_init],,[AC_MSG_ERROR([Can't link against libmysqlclient_r])])
+    dnl AC_CHECK_LIB([mysqlclient_r],[safe_mutex_init],,[PANDORA_MSG_ERROR([Can't link against libmysqlclient_r])])
     dnl First test to see if we can run with only ndbclient
     AC_CHECK_LIB([ndbclient],[decimal_bin_size],,[dnl else
       LDFLAGS="$LDFLAGS -lmysys -ldbug"
       AC_CHECK_LIB([mysqlclient_r],[safe_mutex_init],,)
       AC_CHECK_LIB([ndbclient],[ndb_init],,[
-        AC_MSG_ERROR([Can't link against libndbclient])])
+        PANDORA_MSG_ERROR([Can't link against libndbclient])])
       AC_CHECK_LIB([mystrings],[decimal_bin_size],,[
-          AC_MSG_ERROR([Can't find decimal_bin_size])])])
+          PANDORA_MSG_ERROR([Can't find decimal_bin_size])])])
     AC_MSG_CHECKING(for NdbApi headers)
      AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <NdbApi.hpp>]], [[int attr=NdbTransaction::Commit; ]])],[ndbapi_found="yes"],[])
     AS_IF([test "$ndbapi_found" = "yes"], 
        [AC_MSG_RESULT(found)],
-       [AC_MSG_ERROR([Couldn't find NdbApi.hpp!])])
+       [PANDORA_MSG_ERROR([Couldn't find NdbApi.hpp!])])
     AC_MSG_CHECKING(for NDB_LE_ThreadConfigLoop)
       AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <mgmapi.h>]], [[int attr=NDB_LE_ThreadConfigLoop; ]])],[have_cge63="yes"],[])
       AS_IF([test "$have_cge63" = "yes"],

=== added file 'm4/pandora_have_libndbclient.m4'
--- m4/pandora_have_libndbclient.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_libndbclient.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,80 @@
+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"],
+      PANDORA_MSG_ERROR([libndbclient is required for ${PACKAGE}]))
+])
+

=== added file 'm4/pandora_have_libpcre.m4'
--- m4/pandora_have_libpcre.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_libpcre.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,73 @@
+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 libpcre
+#--------------------------------------------------------------------
+
+
+AC_DEFUN([_PANDORA_SEARCH_LIBPCRE],[
+  AC_REQUIRE([AC_LIB_PREFIX])
+
+  AC_LIB_HAVE_LINKFLAGS(pcre,,
+  [#include <pcre.h>],
+  [
+    pcre *re= NULL;
+    pcre_version();
+  ])
+  AS_IF([test "x$ac_cv_libpcre" = "xno"],
+  [
+    unset ac_cv_libpcre
+    unset HAVE_LIBPCRE
+    unset LIBPCRE
+    unset LIBPCRE_PREFIX
+    unset LTLIBPCRE
+    AC_LIB_HAVE_LINKFLAGS(pcre,,
+    [#include <pcre/pcre.h>],
+    [
+      pcre *re= NULL;
+      pcre_version();
+    ])
+    AS_IF([test "x$ac_cv_libpcre" = "xyes"], [
+      ac_cv_pcre_location="<pcre/pcre.h>"
+    ])
+  ],[
+    ac_cv_pcre_location="<pcre.h>"
+  ])
+
+  AM_CONDITIONAL(HAVE_LIBPCRE, [test "x${ac_cv_libpcre}" = "xyes"])
+])
+
+AC_DEFUN([_PANDORA_HAVE_LIBPCRE],[
+
+  AC_ARG_ENABLE([libpcre],
+    [AS_HELP_STRING([--disable-libpcre],
+      [Build with libpcre support @<:@default=on@:>@])],
+    [ac_enable_libpcre="$enableval"],
+    [ac_enable_libpcre="yes"])
+
+  _PANDORA_SEARCH_LIBPCRE
+])
+
+
+AC_DEFUN([PANDORA_HAVE_LIBPCRE],[
+  AC_REQUIRE([_PANDORA_HAVE_LIBPCRE])
+])
+
+AC_DEFUN([_PANDORA_REQUIRE_LIBPCRE],[
+  ac_enable_libpcre="yes"
+  _PANDORA_SEARCH_LIBPCRE
+
+  AS_IF([test x$ac_cv_libpcre = xno],[
+    PANDORA_MSG_ERROR([libpcre is required for ${PACKAGE}. On Debian this can be found in libpcre3-dev. On RedHat this can be found in pcre-devel.])
+  ],[
+    AC_DEFINE_UNQUOTED(PCRE_HEADER,[${ac_cv_pcre_location}],
+                       [Location of pcre header])
+  ])
+])
+
+AC_DEFUN([PANDORA_REQUIRE_LIBPCRE],[
+  AC_REQUIRE([_PANDORA_REQUIRE_LIBPCRE])
+])

=== modified file 'm4/pandora_have_libpq.m4'
--- m4/pandora_have_libpq.m4	2009-07-29 18:13:26 +0000
+++ m4/pandora_have_libpq.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 
@@ -42,5 +42,5 @@
 AC_DEFUN([PANDORA_REQUIRE_LIBPQ],[
   AC_REQUIRE([PANDORA_HAVE_LIBPQ])
   AS_IF([test "x${ac_cv_libpq}" = "xno"],
-    AC_MSG_ERROR([libpq is required for ${PACKAGE}]))
+    PANDORA_MSG_ERROR([libpq is required for ${PACKAGE}]))
 ])

=== added file 'm4/pandora_have_libpqxx.m4'
--- m4/pandora_have_libpqxx.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_libpqxx.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,44 @@
+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_LIBPQXX],[
+  AC_REQUIRE([AC_LIB_PREFIX])
+
+  dnl --------------------------------------------------------------------
+  dnl  Check for libpqxx
+  dnl --------------------------------------------------------------------
+
+  AC_ARG_ENABLE([libpqxx],
+    [AS_HELP_STRING([--disable-libpqxx],
+      [Build with libpqxx support @<:@default=on@:>@])],
+    [ac_enable_libpqxx="$enableval"],
+    [ac_enable_libpqxx="yes"])
+
+  AS_IF([test "x$ac_enable_libpqxx" = "xyes"],[
+    AC_LANG_PUSH([C++])
+    AC_LIB_HAVE_LINKFLAGS(pqxx,,[
+      #include <pqxx/pqxx>
+    ],[
+       pqxx::connection conn("dbname=test");
+    ])
+    AC_LANG_POP()
+  ],[
+    ac_cv_libpqxx="no"
+  ])
+  
+  AM_CONDITIONAL(HAVE_LIBPQXX, [test "x${ac_cv_libpqxx}" = "xyes"])
+  
+])
+
+AC_DEFUN([PANDORA_HAVE_LIBPQXX],[
+  AC_REQUIRE([_PANDORA_SEARCH_LIBPQXX])
+])
+
+AC_DEFUN([PANDORA_REQUIRE_LIBPQXX],[
+  AC_REQUIRE([PANDORA_HAVE_LIBPQXX])
+  AS_IF([test "x$ac_cv_libpqxx" = "xno"],[
+      PANDORA_MSG_ERROR([libpqxx is required for ${PACKAGE}])
+  ])
+])

=== modified file 'm4/pandora_have_libreadline.m4'
--- m4/pandora_have_libreadline.m4	2009-12-18 18:02:39 +0000
+++ m4/pandora_have_libreadline.m4	2011-04-16 05:39:23 +0000
@@ -56,8 +56,8 @@
 #
 # COPYLEFT
 #
-#   Copyright (c) 2009 Monty Taylor
-#   Copyright (c) 2002 Ville Laurikari <[e-mail]>
+#   Copyright (C) 2009 Monty Taylor
+#   Copyright (C) 2002 Ville Laurikari <[e-mail]>
 #
 #   Copying and distribution of this file, with or without
 #   modification, are permitted in any medium without royalty provided
@@ -231,7 +231,7 @@
   _PANDORA_SEARCH_LIBREADLINE
 
   AS_IF([test "x$ac_cv_libreadline" = "xno"],
-    AC_MSG_ERROR([libreadline is required for ${PACKAGE}. On Debian this can be found in libreadline5-dev. On RedHat this can be found in readline-devel.]))
+    PANDORA_MSG_ERROR([libreadline is required for ${PACKAGE}. On Debian this can be found in libreadline5-dev. On RedHat this can be found in readline-devel.]))
 
 ])
 

=== modified file 'm4/pandora_have_libsqlite3.m4'
--- m4/pandora_have_libsqlite3.m4	2009-07-29 18:13:26 +0000
+++ m4/pandora_have_libsqlite3.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 
@@ -38,5 +38,5 @@
 AC_DEFUN([PANDORA_REQUIRE_LIBSQLITE3],[
   AC_REQUIRE([_PANDORA_SEARCH_LIBSQLITE3])
   AS_IF([test "x${ac_cv_libsqlite3}" = "xno"],
-    AC_MSG_ERROR([libsqlite3 is required for ${PACKAGE}]))
+    PANDORA_MSG_ERROR([libsqlite3 is required for ${PACKAGE}]))
 ])

=== modified file 'm4/pandora_have_libtokyocabinet.m4'
--- m4/pandora_have_libtokyocabinet.m4	2010-04-06 00:33:06 +0000
+++ m4/pandora_have_libtokyocabinet.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
  
@@ -50,5 +50,5 @@
 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.]))
+    PANDORA_MSG_ERROR([libtokyocabinet is required for ${PACKAGE}. On Debian systems this is found in libtokyocabinet-dev. On RedHat, in tokyocabinet-devel.]))
 ])

=== modified file 'm4/pandora_have_libuuid.m4'
--- m4/pandora_have_libuuid.m4	2009-12-18 18:02:39 +0000
+++ m4/pandora_have_libuuid.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 
@@ -46,7 +46,7 @@
   ac_enable_libuuid="yes"
   _PANDORA_SEARCH_LIBUUID
   AS_IF([test "x$ac_cv_header_uuid_uuid_h" = "xno"],[
-    AC_MSG_ERROR([Couldn't find uuid/uuid.h. On Debian this can be found in uuid-dev. On Redhat this can be found in e2fsprogs-devel.])
+    PANDORA_MSG_ERROR([Couldn't find uuid/uuid.h. On Debian this can be found in uuid-dev. On RHEL 4 this can be found in e2fsprogs-devel and Fedora/RHEL 6 in libuuid-devel.])
   ])
 ])
 

=== added file 'm4/pandora_have_libvbucket.m4'
--- m4/pandora_have_libvbucket.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_libvbucket.m4	2011-04-16 05:39:23 +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],
+      PANDORA_MSG_ERROR([libvbucket is required for ${PACKAGE}]))
+])

=== modified file 'm4/pandora_have_libxml2.m4'
--- m4/pandora_have_libxml2.m4	2009-12-18 18:02:39 +0000
+++ m4/pandora_have_libxml2.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
  
@@ -48,5 +48,5 @@
 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.]))
+    PANDORA_MSG_ERROR([libxml2 is required for ${PACKAGE}. On Debian systems this is found in libxml2-dev. On RedHat, libxml2-devel.]))
 ])

=== modified file 'm4/pandora_have_libz.m4'
--- m4/pandora_have_libz.m4	2009-12-18 18:02:39 +0000
+++ m4/pandora_have_libz.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 
@@ -42,7 +42,7 @@
   _PANDORA_SEARCH_LIBZ
 
   AS_IF([test x$ac_cv_libz = xno],[
-    AC_MSG_ERROR([libz is required for ${PACKAGE}. On Debian this can be found in zlib1g-dev. On RedHat this can be found in zlib-devel.])
+    PANDORA_MSG_ERROR([libz is required for ${PACKAGE}. On Debian this can be found in zlib1g-dev. On RedHat this can be found in zlib-devel.])
   ])
 ])
 

=== modified file 'm4/pandora_have_protobuf.m4'
--- m4/pandora_have_protobuf.m4	2009-09-29 04:30:01 +0000
+++ m4/pandora_have_protobuf.m4	2011-04-16 05:39:23 +0000
@@ -23,7 +23,9 @@
     [#include <google/protobuf/descriptor.h>],
     [google::protobuf::FileDescriptor* file;],
     [system])
-  CXXFLAGS="${save_CXXFLAGS}"
+  CXXFLAGS="${PTHREAD_CFLAGS} ${save_CXXFLAGS}"
+  LIBPROTOBUF="${LIBPROTOBUF} ${PTHREAD_LIBS}"
+  LTLIBPROTOBUF="${LTLIBPROTOBUF} ${PTHREAD_LIBS}"
   AC_LANG_POP()
 ])
 
@@ -34,7 +36,7 @@
 AC_DEFUN([PANDORA_REQUIRE_LIBPROTOBUF],[
   AC_REQUIRE([PANDORA_HAVE_LIBPROTOBUF])
   AS_IF([test x$ac_cv_libprotobuf = xno],
-      AC_MSG_ERROR([libprotobuf is required for ${PACKAGE}. On Debian this can be found in libprotobuf-dev. On RedHat this can be found in protobuf-devel.]))
+      PANDORA_MSG_ERROR([libprotobuf is required for ${PACKAGE}. On Debian this can be found in libprotobuf-dev. On RedHat this can be found in protobuf-devel.]))
 ])
 
 AC_DEFUN([PANDORA_PROTOBUF_REQUIRE_VERSION],[
@@ -56,7 +58,7 @@
     [drizzle_cv_protobuf_recent=yes],
     [drizzle_cv_protobuf_recent=no])])
   AS_IF([test "$drizzle_cv_protobuf_recent" = "no"],[
-    AC_MSG_ERROR([Your version of Google Protocol Buffers is too old. ${PACKAGE} requires at least version $p_recent_ver])
+    PANDORA_MSG_ERROR([Your version of Google Protocol Buffers is too old. ${PACKAGE} requires at least version $p_recent_ver])
   ])
   AC_LANG_POP()
 ])
@@ -73,7 +75,7 @@
 AC_DEFUN([PANDORA_REQUIRE_PROTOC],[
   AC_REQUIRE([PANDORA_HAVE_PROTOC])
   AS_IF([test "x$PROTOC" = "xno"],[
-    AC_MSG_ERROR([Couldn't find the protoc compiler. On Debian this can be found in protobuf-compiler. On RedHat this can be found in protobuf-compiler.])
+    PANDORA_MSG_ERROR([Couldn't find the protoc compiler. On Debian this can be found in protobuf-compiler. On RedHat this can be found in protobuf-compiler.])
   ])
 ])
 

=== added file 'm4/pandora_have_sasl.m4'
--- m4/pandora_have_sasl.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_sasl.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,133 @@
+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_SASL],[
+  AC_REQUIRE([AC_LIB_PREFIX])
+
+  dnl --------------------------------------------------------------------
+  dnl  Check for sasl
+  dnl --------------------------------------------------------------------
+  AC_ARG_ENABLE([sasl],
+    [AS_HELP_STRING([--disable-sasl],
+      [Build with sasl support @<:@default=on@:>@])],
+    [ac_enable_sasl="$enableval"],
+    [ac_enable_sasl="yes"])
+
+  AS_IF([test "x$ac_enable_sasl" = "xyes"],
+    [
+      AC_LIB_HAVE_LINKFLAGS(sasl,,[
+        #include <stdlib.h>
+        #include <sasl/sasl.h>
+      ],[
+        sasl_server_init(NULL, NULL);
+      ])
+
+      AS_IF([test "x${ac_cv_libsasl}" != "xyes" ],
+            [
+              AC_LIB_HAVE_LINKFLAGS(sasl2,,[
+                #include <stdlib.h>
+                #include <sasl/sasl.h>
+              ],[
+                sasl_server_init(NULL, NULL);
+              ])
+              HAVE_LIBSASL="$HAVE_LIBSASL2"
+              LIBSASL="$LIBSASL2"
+              LIBSASL_PREFIX="$LIBSASL2_PREFIX"
+	      LTLIBSASL="$LT_LIBSASL2"
+            ])
+    ])
+
+  AS_IF([test "x${ac_cv_libsasl}" = "xyes" -o "x${ac_cv_libsasl2}" = "xyes"],
+        [ac_cv_sasl=yes],
+        [ac_cv_sasl=no])
+
+  AM_CONDITIONAL(HAVE_LIBSASL, [test "x${ac_cv_libsasl}" = "xyes"])
+  AM_CONDITIONAL(HAVE_LIBSASL2, [test "x${ac_cv_libsasl2}" = "xyes"])
+  AM_CONDITIONAL(HAVE_SASL, [test "x${ac_cv_sasl}" = "xyes"])
+])
+
+AC_DEFUN([PANDORA_HAVE_SASL],[
+  AC_REQUIRE([_PANDORA_SEARCH_SASL])
+])
+
+AC_DEFUN([PANDORA_REQUIRE_SASL],[
+  AC_REQUIRE([_PANDORA_SEARCH_SASL])
+  AS_IF([test "x${ac_cv_sasl}" = "xno"],
+    PANDORA_MSG_ERROR([SASL (libsasl or libsasl2) is required for ${PACKAGE}]))
+])
+
+AC_DEFUN([_PANDORA_SEARCH_LIBSASL],[
+  AC_REQUIRE([AC_LIB_PREFIX])
+
+  dnl --------------------------------------------------------------------
+  dnl  Check for libsasl
+  dnl --------------------------------------------------------------------
+
+  AC_ARG_ENABLE([libsasl],
+    [AS_HELP_STRING([--disable-libsasl],
+      [Build with libsasl support @<:@default=on@:>@])],
+    [ac_enable_libsasl="$enableval"],
+    [ac_enable_libsasl="yes"])
+
+  AS_IF([test "x$ac_enable_libsasl" = "xyes"],[
+    AC_LIB_HAVE_LINKFLAGS(sasl,,[
+      #include <stdlib.h>
+      #include <sasl/sasl.h>
+    ],[
+      sasl_server_init(NULL, NULL);
+    ])
+  ],[
+    ac_cv_libsasl="no"
+  ])
+
+  AM_CONDITIONAL(HAVE_LIBSASL, [test "x${ac_cv_libsasl}" = "xyes"])
+])
+
+AC_DEFUN([PANDORA_HAVE_LIBSASL],[
+  AC_REQUIRE([_PANDORA_SEARCH_LIBSASL])
+])
+
+AC_DEFUN([PANDORA_REQUIRE_LIBSASL],[
+  AC_REQUIRE([_PANDORA_SEARCH_LIBSASL])
+  AS_IF([test "x${ac_cv_libsasl}" = "xno"],
+    PANDORA_MSG_ERROR([libsasl is required for ${PACKAGE}]))
+])
+
+AC_DEFUN([_PANDORA_SEARCH_LIBSASL2],[
+  AC_REQUIRE([AC_LIB_PREFIX])
+
+  dnl --------------------------------------------------------------------
+  dnl  Check for libsasl2
+  dnl --------------------------------------------------------------------
+
+  AC_ARG_ENABLE([libsasl2],
+    [AS_HELP_STRING([--disable-libsasl2],
+      [Build with libsasl2 support @<:@default=on@:>@])],
+    [ac_enable_libsasl2="$enableval"],
+    [ac_enable_libsasl2="yes"])
+
+  AS_IF([test "x$ac_enable_libsasl2" = "xyes"],[
+    AC_LIB_HAVE_LINKFLAGS(sasl2,,[
+      #include <stdlib.h>
+      #include <sasl2/sasl2.h>
+    ],[
+      sasl2_server_init(NULL, NULL);
+    ])
+  ],[
+    ac_cv_libsasl2="no"
+  ])
+
+  AM_CONDITIONAL(HAVE_LIBSASL2, [test "x${ac_cv_libsasl2}" = "xyes"])
+])
+
+AC_DEFUN([PANDORA_HAVE_LIBSASL2],[
+  AC_REQUIRE([_PANDORA_SEARCH_LIBSASL2])
+])
+
+AC_DEFUN([PANDORA_REQUIRE_LIBSASL2],[
+  AC_REQUIRE([_PANDORA_SEARCH_LIBSASL2])
+  AS_IF([test "x${ac_cv_libsasl2}" = "xno"],
+    PANDORA_MSG_ERROR([libsasl2 is required for ${PACKAGE}]))
+])

=== modified file 'm4/pandora_have_thrift.m4'
--- m4/pandora_have_thrift.m4	2010-04-06 00:33:06 +0000
+++ m4/pandora_have_thrift.m4	2011-04-16 05:39:23 +0000
@@ -39,7 +39,7 @@
 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}])
+      PANDORA_MSG_ERROR([thrift required for ${PACKAGE}])
   ])
 ])
 

=== modified file 'm4/pandora_header_assert.m4'
--- m4/pandora_header_assert.m4	2009-12-18 19:25:00 +0000
+++ m4/pandora_header_assert.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 

=== added file 'm4/pandora_header_stdcxx_98.m4'
--- m4/pandora_header_stdcxx_98.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_header_stdcxx_98.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,83 @@
+# ===========================================================================
+#        http://autoconf-archive.cryp.to/ac_cxx_header_stdcxx_98.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AC_CXX_HEADER_STDCXX_98
+#
+# DESCRIPTION
+#
+#   Check for complete library coverage of the C++1998/2003 standard.
+#
+# LICENSE
+#
+#   Copyright (C) 2008 Benjamin Kosnik <[e-mail]>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.
+
+AC_DEFUN([AC_CXX_HEADER_STDCXX_98], [
+  AC_CACHE_CHECK(for ISO C++ 98 include files,
+  ac_cv_cxx_stdcxx_98,
+  [AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  AC_TRY_COMPILE([
+    #include <cassert>
+    #include <cctype>
+    #include <cerrno>
+    #include <cfloat>
+    #include <ciso646>
+    #include <climits>
+    #include <clocale>
+    #include <cmath>
+    #include <csetjmp>
+    #include <csignal>
+    #include <cstdarg>
+    #include <cstddef>
+    #include <cstdio>
+    #include <cstdlib>
+    #include <cstring>
+    #include <ctime>
+
+    #include <algorithm>
+    #include <bitset>
+    #include <complex>
+    #include <deque>
+    #include <exception>
+    #include <fstream>
+    #include <functional>
+    #include <iomanip>
+    #include <ios>
+    #include <iosfwd>
+    #include <iostream>
+    #include <istream>
+    #include <iterator>
+    #include <limits>
+    #include <list>
+    #include <locale>
+    #include <map>
+    #include <memory>
+    #include <new>
+    #include <numeric>
+    #include <ostream>
+    #include <queue>
+    #include <set>
+    #include <sstream>
+    #include <stack>
+    #include <stdexcept>
+    #include <streambuf>
+    #include <string>
+    #include <typeinfo>
+    #include <utility>
+    #include <valarray>
+    #include <vector>
+  ],,
+  ac_cv_cxx_stdcxx_98=yes, ac_cv_cxx_stdcxx_98=no)
+  AC_LANG_RESTORE
+  ])
+  if test "$ac_cv_cxx_stdcxx_98" = yes; then
+    AC_DEFINE(STDCXX_98_HEADERS,,[Define if ISO C++ 1998 header files are present. ])
+  fi
+])

=== added file 'm4/pandora_intltool.m4'
--- m4/pandora_intltool.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_intltool.m4	2011-04-16 05:39:23 +0000
@@ -0,0 +1,225 @@
+## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*-
+## Copyright (C) 2001 Eazel, Inc.
+## Author: Maciej Stachowiak <[e-mail]>
+##         Kenneth Christiansen <[e-mail]>
+##
+## 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])
+	PANDORA_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], ...)
+

=== modified file 'm4/pandora_libtool.m4'
--- m4/pandora_libtool.m4	2009-12-18 18:02:39 +0000
+++ m4/pandora_libtool.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 
@@ -12,7 +12,7 @@
     pandora_have_old_libtool=no
   ])
   AS_IF([test "$SUNCC" = "yes" -a "${pandora_have_old_libtool}" = "yes"],[
-    AC_MSG_ERROR([Building ${PACKAGE} with Sun Studio requires at least libtool 2.2])
+    PANDORA_MSG_ERROR([Building ${PACKAGE} with Sun Studio requires at least libtool 2.2])
   ])
 
   dnl By requiring AC_PROG_LIBTOOL, we should force the macro system to read

=== modified file 'm4/pandora_optimize.m4'
--- m4/pandora_optimize.m4	2009-12-24 17:19:53 +0000
+++ m4/pandora_optimize.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 
@@ -22,25 +22,21 @@
     dnl with using AC_CC_STD_C99 above
     CC="${CC} -std=gnu99"
 
-    AM_CPPFLAGS="-ggdb3 ${AM_CPPFLAGS}"
+    AM_CPPFLAGS="-g ${AM_CPPFLAGS}"
 
     DEBUG_CFLAGS="-O0"
     DEBUG_CXXFLAGS="-O0"
 
-    OPTIMIZE_CFLAGS="-O3"
-    OPTIMIZE_CXXFLAGS="-O3"
+    OPTIMIZE_CFLAGS="-O2"
+    OPTIMIZE_CXXFLAGS="-O2"
   ])
   AS_IF([test "$INTELCC" = "yes"],[
-    dnl Once we can use a modern autoconf, we can replace the std=gnu99 here
-    dnl with using AC_CC_STD_C99 above
-    CC="${CC} -std=c99"
-
     AM_CPPFLAGS="-g ${AM_CPPFLAGS}"
 
     DEBUG_CFLAGS="-O0"
     DEBUG_CXXFLAGS="-O0"
 
-    OPTIMIZE_CFLAGS="-xHOST -O3 -no-prec-div -static"
+    OPTIMIZE_CFLAGS="-xHOST -O2 -no-prec-div -static"
     OPTIMIZE_CXXFLAGS="${OPTIMIZE_CFLAGS}"
 
   ])

=== modified file 'm4/pandora_platform.m4'
--- m4/pandora_platform.m4	2011-04-14 05:40:29 +0000
+++ m4/pandora_platform.m4	2011-04-16 05:39:23 +0000
@@ -23,7 +23,7 @@
 
 
   case "$host_os" in
-    *solaris*|*freebsd*)
+    *solaris*)
     AS_IF([test "x${ac_cv_env_CPPFLAGS_set}" = "x"],[
       CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
     ])
@@ -32,6 +32,15 @@
       LDFLAGS="${LDFLAGS} -L/usr/local/lib"
     ])
     ;;
+    *freebsd*)
+    AS_IF([test "x${ac_cv_env_CPPFLAGS_set}" = "x"],[
+      CPPFLAGS="${CPPFLAGS} -isystem /usr/local/include"
+    ])
+
+    AS_IF([test "x${ac_cv_env_LDFLAGS_set}" = "x"],[
+      LDFLAGS="${LDFLAGS} -L/usr/local/lib"
+    ])
+    ;;
   esac
 
   PANDORA_OPTIMIZE_BITFIELD=1
@@ -50,6 +59,7 @@
     *solaris*)
       TARGET_SOLARIS="true"
       PANDORA_OPTIMIZE_BITFIELD=0
+      AS_IF([test "x${USE_NLS}" = "xyes"],[LIBS="${LIBS} -lintl"])
       AC_SUBST(TARGET_SOLARIS)
       AC_DEFINE([TARGET_OS_SOLARIS], [1], [Whether we are building for Solaris])
       ;;
@@ -59,12 +69,29 @@
       AC_DEFINE([TARGET_OS_FREEBSD], [1], [Whether we are building for FreeBSD])
       AC_DEFINE([__APPLE_CC__],[1],[Workaround for bug in FreeBSD headers])
       ;;
-    *)
+    *mingw32*)
+      TARGET_WINDOWS="true"
+      AC_SUBST(TARGET_WINDOWS)
+      AC_DEFINE([TARGET_OS_WINDOWS], [1], [Whether we are building for Windows])
+      AC_DEFINE([WINVER], [WindowsXP], [Version of Windows])
+      AC_DEFINE([_WIN32_WINNT], [0x0501], [Magical number to make things work])
+      AC_DEFINE([EAI_SYSTEM], [11], [Another magical number])
+      AH_BOTTOM([
+#ifndef HAVE_SYS_SOCKET_H
+# define SHUT_RD SD_RECEIVE
+# define SHUT_WR SD_SEND
+# define SHUT_RDWR SD_BOTH
+#endif
+      ])
+
+      LIBS="$LIBS -lwsock32 -lws2_32"
+      AM_CFLAGS="${AM_CFLAGS} -I\${top_srcdir}/win32/mingw -I\${top_builddir}/win32/mingw -I\${top_srcdir}/win32 -I\${top_builddir}/win32"
       ;;
   esac
+  AM_CONDITIONAL(BUILD_WIN32, [test "x${TARGET_WINDOWS}" = "xtrue"])
+  AM_CONDITIONAL(TARGET_OSX, [test "x${TARGET_OSX}" = "xtrue"])
 
   AC_SUBST(PANDORA_OPTIMIZE_BITFIELD)
-  AM_CONDITIONAL(TARGET_OSX,[test "${TARGET_OSX}" = "yes"])
 
   AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
   AC_CHECK_DECL([__ICC], [INTELCC="yes"], [INTELCC="no"])

=== modified file 'm4/pandora_plugins.m4'
--- m4/pandora_plugins.m4	2010-04-06 00:33:06 +0000
+++ m4/pandora_plugins.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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--------------------------------------------------------------------
@@ -17,21 +17,30 @@
   dnl get called probably during autoconf too, so it's important to protect
   dnl with test -f ... if the files exist, we don't have the chicken/egg 
   dnl problem and therefore don't need to do anything here
-  m4_syscmd([python config/pandora-plugin > /dev/null])
+  m4_syscmd([PYTHON=${PYTHON:-python} && $PYTHON config/pandora-plugin > /dev/null])
   m4_syscmd([test -f config/plugin.stamp || touch config/plugin.stamp aclocal.m4])
 
   m4_sinclude(config/pandora-plugin.ac)
 
   dnl Add code here to read set plugin lists and  set drizzled_default_plugin_list
   pandora_builtin_list=`echo $pandora_builtin_list | sed 's/, *$//'`
-  AS_IF([test "x$pandora_builtin_list" = "x"], pandora_builtin_list="NULL")
+  pandora_builtin_symbols_list=`echo $pandora_builtin_symbols_list | sed 's/, *$//'`
+  pandora_builtin_load_list=`echo $pandora_builtin_load_list | sed 's/, *$//'`
+  pandora_builtin_load_symbols_list=`echo $pandora_builtin_load_symbols_list | sed 's/, *$//'`
+  AS_IF([test "x$pandora_builtin_symbols_list" = "x"], pandora_builtin_symbols_list="NULL")
+  AS_IF([test "x$pandora_builtin_load_symbols_list" = "x"], pandora_builtin_load_symbols_list="NULL")
   AC_SUBST([PANDORA_BUILTIN_LIST],[$pandora_builtin_list])
+  AC_SUBST([PANDORA_BUILTIN_SYMBOLS_LIST],[$pandora_builtin_symbols_list])
+  AC_SUBST([PANDORA_BUILTIN_LOAD_LIST],[$pandora_builtin_load_list])
+  AC_SUBST([PANDORA_BUILTIN_LOAD_SYMBOLS_LIST],[$pandora_builtin_load_symbols_list])
   AC_SUBST([PANDORA_PLUGIN_LIST],[$pandora_default_plugin_list])
   m4_ifval(m4_normalize([$1]),[
     AC_CONFIG_FILES($*)
     ],[
-    AC_DEFINE_UNQUOTED([PANDORA_BUILTIN_LIST],[$pandora_builtin_list],
+    AC_DEFINE_UNQUOTED([PANDORA_BUILTIN_LIST],["$pandora_builtin_list"],
                        [List of plugins to be built in])
+    AC_DEFINE_UNQUOTED([PANDORA_BUILTIN_SYMBOLS_LIST],["$pandora_builtin_symbols_list"],
+                       [List of builtin plugin symbols to be built in])
     AC_DEFINE_UNQUOTED([PANDORA_PLUGIN_LIST],["$pandora_default_plugin_list"],
                        [List of plugins that should be loaded on startup if no
                         value is given for --plugin-load])

=== modified file 'm4/pandora_print_callstack.m4'
--- m4/pandora_print_callstack.m4	2010-01-13 10:48:24 +0000
+++ m4/pandora_print_callstack.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 

=== modified file 'm4/pandora_pthread.m4'
--- m4/pandora_pthread.m4	2009-12-18 19:25:00 +0000
+++ m4/pandora_pthread.m4	2011-04-16 05:39:23 +0000
@@ -254,5 +254,5 @@
 AC_DEFUN([PANDORA_REQUIRE_PTHREAD],[
   AC_REQUIRE([PANDORA_HAVE_PTHREAD])
   AS_IF([test "x$acx_pthread_ok" != "xyes"],[
-    AC_MSG_ERROR(could not find libpthread)])
+    PANDORA_MSG_ERROR(could not find libpthread)])
 ])

=== modified file 'm4/pandora_python3_devel.m4'
--- m4/pandora_python3_devel.m4	2009-09-29 04:30:01 +0000
+++ m4/pandora_python3_devel.m4	2011-04-16 05:39:23 +0000
@@ -4,12 +4,12 @@
 dnl pandora-build: A pedantic build system
 dnl
 dnl   Copyright (C) 2009 Sun Microsystems, Inc.
-dnl   Copyright (c) 2008 Sebastian Huber <[e-mail]>
-dnl   Copyright (c) 2008 Alan W. Irwin <[e-mail]>
-dnl   Copyright (c) 2008 Rafael Laboissiere <[e-mail]>
-dnl   Copyright (c) 2008 Andrew Collier <[e-mail]>
-dnl   Copyright (c) 2008 Matteo Settenvini <[e-mail]>
-dnl   Copyright (c) 2008 Horst Knorr <[e-mail]>
+dnl   Copyright (C) 2008 Sebastian Huber <[e-mail]>
+dnl   Copyright (C) 2008 Alan W. Irwin <[e-mail]>
+dnl   Copyright (C) 2008 Rafael Laboissiere <[e-mail]>
+dnl   Copyright (C) 2008 Andrew Collier <[e-mail]>
+dnl   Copyright (C) 2008 Matteo Settenvini <[e-mail]>
+dnl   Copyright (C) 2008 Horst Knorr <[e-mail]>
 dnl
 dnl   This program is free software: you can redistribute it and/or modify it
 dnl   under the terms of the GNU General Public License as published by the
@@ -76,7 +76,7 @@
   	AC_PATH_PROG([PYTHON3],[python[$PYTHON3_VERSION]])
   ])
 	AS_IF([test -z "$PYTHON3"],[
-	  AC_MSG_ERROR([Cannot find python$PYTHON3_VERSION in your system path])
+	  PANDORA_MSG_ERROR([Cannot find python$PYTHON3_VERSION in your system path])
 	  PYTHON3_VERSION=""
   ])
 
@@ -92,7 +92,7 @@
 	   	   AC_MSG_RESULT([yes])
 		else
 			AC_MSG_RESULT([no])
-			AC_MSG_ERROR([this package requires Python $1.
+			PANDORA_MSG_ERROR([this package requires Python $1.
 If you have it installed, but it isn't the default Python
 interpreter in your system path, please pass the PYTHON3_VERSION
 variable to configure. See ``configure --help'' for reference.
@@ -110,7 +110,7 @@
 		AC_MSG_RESULT([yes])
 	else
 		AC_MSG_RESULT([no])
-		AC_MSG_ERROR([cannot import Python3 module "distutils".
+		PANDORA_MSG_ERROR([cannot import Python3 module "distutils".
 Please check your Python3 installation. The error was:
 $ac_python3_distutils_result])
 		PYTHON3_VERSION=""

=== modified file 'm4/pandora_sasl.m4'
--- m4/pandora_sasl.m4	2009-12-18 18:02:39 +0000
+++ m4/pandora_sasl.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 
@@ -55,7 +55,7 @@
 AC_DEFUN([PANDORA_REQUIRE_SASL],[
   AC_REQUIRE([_PANDORA_SEARCH_SASL])
   AS_IF([test "x${ac_cv_sasl}" = "xno"],
-    AC_MSG_ERROR([SASL (libsasl or libsasl2) is required for ${PACKAGE}]))
+    PANDORA_MSG_ERROR([SASL (libsasl or libsasl2) is required for ${PACKAGE}]))
 ])
 
 AC_DEFUN([_PANDORA_SEARCH_LIBSASL],[
@@ -92,7 +92,7 @@
 AC_DEFUN([PANDORA_REQUIRE_LIBSASL],[
   AC_REQUIRE([_PANDORA_SEARCH_LIBSASL])
   AS_IF([test "x${ac_cv_libsasl}" = "xno"],
-    AC_MSG_ERROR([libsasl is required for ${PACKAGE}]))
+    PANDORA_MSG_ERROR([libsasl is required for ${PACKAGE}]))
 ])
 
 AC_DEFUN([_PANDORA_SEARCH_LIBSASL2],[
@@ -129,5 +129,5 @@
 AC_DEFUN([PANDORA_REQUIRE_LIBSASL2],[
   AC_REQUIRE([_PANDORA_SEARCH_LIBSASL2])
   AS_IF([test "x${ac_cv_libsasl2}" = "xno"],
-    AC_MSG_ERROR([libsasl2 is required for ${PACKAGE}]))
+    PANDORA_MSG_ERROR([libsasl2 is required for ${PACKAGE}]))
 ])

=== modified file 'm4/pandora_shared_ptr.m4'
--- m4/pandora_shared_ptr.m4	2009-12-18 18:02:39 +0000
+++ m4/pandora_shared_ptr.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 

=== modified file 'm4/pandora_stl_hash.m4'
--- m4/pandora_stl_hash.m4	2010-04-06 00:33:06 +0000
+++ m4/pandora_stl_hash.m4	2011-04-16 05:39:23 +0000
@@ -1,3 +1,8 @@
+# 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
@@ -83,7 +88,7 @@
 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}.
+    PANDORA_MSG_ERROR([An STL compliant unordered_map is required for ${PACKAGE}.
     Implementations can be found in Recent versions of gcc and in boost])
   ])
 ])

=== modified file 'm4/pandora_vc_build.m4'
--- m4/pandora_vc_build.m4	2010-04-06 00:33:06 +0000
+++ m4/pandora_vc_build.m4	2011-04-16 05:39:23 +0000
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+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.
 
@@ -36,7 +36,14 @@
 ])
 
 AC_DEFUN([PANDORA_BUILDING_FROM_VC],[
-  m4_syscmd(PANDORA_TEST_VC_DIR [
+  m4_syscmd(PANDORA_TEST_VC_DIR
+    m4_if(PCT_NO_VC_CHANGELOG,yes,[
+      vc_changelog=no
+      ],[
+      vc_changelog=yes
+      ])
+  
+    [
 
     PANDORA_RELEASE_DATE=`date +%Y.%m`
     PANDORA_RELEASE_NODOTS_DATE=`date +%Y%m`
@@ -53,6 +60,18 @@
         PANDORA_VC_REVNO="${PANDORA_BZR_REVNO}"
         PANDORA_VC_REVID=`bzr log -r-1 --show-ids | grep revision-id | cut -f2 -d' ' | head -1`
         PANDORA_VC_BRANCH=`bzr nick`
+        PANDORA_VC_TAG=`bzr tags -r-1 | cut -f1 -d' ' | head -1`
+        PANDORA_VC_LATEST_TAG=`bzr tags --sort=time | grep -v '\?'| cut -f1 -d' '  | tail -1`
+        if test "x${vc_changelog}" = "xyes"; then
+          bzr log --gnu > ChangeLog
+        fi
+      fi
+    elif test "${pandora_building_from_git}" = "yes"; then
+      echo "# Grabbing changelog and version information from git"
+      PANDORA_GIT_REVID=`git --no-pager log --max-count=1 | cut -f2 -d' ' | head -1`
+      if test "x$PANDORA_GIT_REVID" != "x${PANDORA_VC_REVNO}" ; then
+         PANDORA_VC_REVID="${PANDORA_GIT_REVID}"
+         PANDORA_VC_BRANCH=`git branch | grep -Ei "\* (.*)" | cut -f2 -d' '`
       fi
     fi
 
@@ -60,17 +79,21 @@
       mkdir -p config
     fi
 
-    cat > config/pandora_vc_revinfo.tmp <<EOF
+    if test "${pandora_building_from_bzr}" = "yes" -o ! -f config/pandora_vc_revinfo ; then 
+      cat > config/pandora_vc_revinfo.tmp <<EOF
 PANDORA_VC_REVNO=${PANDORA_VC_REVNO}
 PANDORA_VC_REVID=${PANDORA_VC_REVID}
 PANDORA_VC_BRANCH=${PANDORA_VC_BRANCH}
+PANDORA_VC_TAG=${PANDORA_VC_TAG}
+PANDORA_VC_LATEST_TAG=${PANDORA_VC_LATEST_TAG}
 PANDORA_RELEASE_DATE=${PANDORA_RELEASE_DATE}
 PANDORA_RELEASE_NODOTS_DATE=${PANDORA_RELEASE_NODOTS_DATE}
 EOF
-    if ! diff config/pandora_vc_revinfo.tmp config/pandora_vc_revinfo >/dev/null 2>&1 ; then
-      mv config/pandora_vc_revinfo.tmp config/pandora_vc_revinfo
+      if ! diff config/pandora_vc_revinfo.tmp config/pandora_vc_revinfo >/dev/null 2>&1 ; then
+        mv config/pandora_vc_revinfo.tmp config/pandora_vc_revinfo
+      fi
+      rm -f config/pandora_vc_revinfo.tmp
     fi
-    rm -f config/pandora_vc_revinfo.tmp
   ])
 ])
   
@@ -88,6 +111,10 @@
     _PANDORA_READ_FROM_FILE([PANDORA_VC_REVID],${srcdir}/config/pandora_vc_revinfo)
     _PANDORA_READ_FROM_FILE([PANDORA_VC_BRANCH],
                             ${srcdir}/config/pandora_vc_revinfo)
+    _PANDORA_READ_FROM_FILE([PANDORA_VC_TAG],
+                            ${srcdir}/config/pandora_vc_revinfo)
+    _PANDORA_READ_FROM_FILE([PANDORA_VC_LATEST_TAG],
+                            ${srcdir}/config/pandora_vc_revinfo)
     _PANDORA_READ_FROM_FILE([PANDORA_RELEASE_DATE],
                             ${srcdir}/config/pandora_vc_revinfo)
     _PANDORA_READ_FROM_FILE([PANDORA_RELEASE_NODOTS_DATE],
@@ -99,8 +126,25 @@
     PANDORA_RELEASE_COMMENT="trunk"
   ])
     
-  PANDORA_RELEASE_VERSION="${PANDORA_RELEASE_DATE}.${PANDORA_VC_REVNO}"
-  PANDORA_RELEASE_ID="${PANDORA_RELEASE_NODOTS_DATE}${PANDORA_VC_REVNO}"
+  AS_IF([test "x${PANDORA_VC_TAG}" != "x"],[
+    PANDORA_RELEASE_VERSION="${PANDORA_VC_TAG}"
+    changequote(<<, >>)dnl
+    PANDORA_RELEASE_ID=`echo ${PANDORA_RELEASE_VERSION} | sed 's/[^0-9]//g'`
+    changequote([, ])dnl
+  ],[
+    AS_IF([test "x${PANDORA_VC_LATEST_TAG}" != "x"],[
+      PANDORA_RELEASE_VERSION="${PANDORA_VC_LATEST_TAG}.${PANDORA_VC_REVNO}"
+      changequote(<<, >>)dnl
+      PANDORA_RELEASE_ID=`echo ${PANDORA_VC_LATEST_TAG} | sed 's/[^0-9]//g'`
+      changequote([, ])dnl
+    ],[
+      PANDORA_RELEASE_VERSION="${PANDORA_RELEASE_DATE}.${PANDORA_VC_REVNO}"
+      changequote(<<, >>)dnl
+      PANDORA_RELEASE_ID=`echo ${PANDORA_RELEASE_DATE} | sed 's/[^0-9]//g'`
+      changequote([, ])dnl
+    ])
+  ])