Merge lp:~mordred/drizzle/various-build-fixes into lp:~drizzle-trunk/drizzle/development

[Monty Taylor]

Fixes several build issues. Also, adds the build requirement on the boost::program_options library.

[Brian Aker (brianaker)]

Broken on a number of platforms (including FreeBSD).
http://hudson.drizzle.org/view/Drizzle-build/job/drizzle-build-freebsd-8.0/235/console

review: Needs Fixing

[Monty Taylor (mordred)]

On 04/30/2010 02:57 PM, Brian Aker wrote:
> Review: Needs Fixing
> Broken on a number of platforms (including FreeBSD).
> http://hudson.drizzle.org/view/Drizzle-build/job/drizzle-build-freebsd-8.0/235/console
>

Weird. I merged up with trunk and re-ran with no problems (well, other
than the usual rabbitmq failure)

http://hudson.drizzle.org/view/Drizzle-param/job/drizzle-param/149/

Specifically freebsd 8.0 is fine here:

http://hudson.drizzle.org/view/Drizzle-param/job/drizzle-param/149/BUILD_TYPE=release,label=freebsd-8.0-amd64/

Perhaps there was a merge weirdness?

[Monty Taylor (mordred)]

Merged up with current trunk and re-ran on param-build. All good. This contains the lcov fix and the dtrace fix. Also, this contains the requirement that hosts have libboost_program_options and provides variables so that that work can be happy.

[Brian Aker (brianaker)]

Build problems (as reported on IRC)

review: Needs Fixing

[Monty Taylor (mordred)]

Found the error on opensolaris. doh. Re-running through param build (esp. now that eric fixed the solaris param-build builders)

[Monty Taylor (mordred)]

Ok. Re-ran on param-build, this time including the solaris builders. All seems happy now. Running through valgrind and sysbench,

[Brian Aker (brianaker)]

Please tell me when you get this all worked out.

review: Needs Information

[Monty Taylor (mordred)]

On 05/07/2010 11:08 AM, Brian Aker wrote:
> Review: Needs Information
> Please tell me when you get this all worked out.

Whoops. Forgot to follow up - valgrind and sysbench both also reported
fine. Good to go.

[Stewart Smith (stewart)]

With this branch, we can have innobase or embedded_innodb builds.

review: Approve

=== added file '.quickly'
--- .quickly	1970-01-01 00:00:00 +0000
+++ .quickly	2010-05-13 16:14:25 +0000
@@ -0,0 +1,5 @@
+project = drizzle
+version = 0.4.2
+template = pandora-build
+project-type = application
+pandora-version = 0.127

=== modified file 'config/autorun.sh'
--- config/autorun.sh	2009-12-03 18:30:10 +0000
+++ config/autorun.sh	2010-05-13 16:14:25 +0000
@@ -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

=== modified file 'config/make-lint.py'
--- config/make-lint.py	2010-04-22 04:24:24 +0000
+++ config/make-lint.py	2010-05-13 16:14:25 +0000
@@ -123,6 +123,9 @@
     if not (path.startswith('plugin/') or path.startswith('drizzled/') or
         path.startswith('client/')):
         return False
+    # Let's not lint emacs autosave files
+    if (os.path.split(path)[-1].startswith('.#')):
+        return False
     for exclude in ['innobase', 'pbxt', 'gnulib', '.pb.', 'bak-header', 'm4',
         'sql_yacc', 'gperf', 'drizzled/probes.h',
         'drizzled/function_hash.h', 'drizzled/symbol_hash.h',

=== modified file 'config/pandora-plugin'
--- config/pandora-plugin	2010-04-16 05:36:53 +0000
+++ config/pandora-plugin	2010-05-13 16:14:25 +0000
@@ -15,14 +15,16 @@
 #  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 
+# Find plugins in the tree and add them to the build system
 
 import ConfigParser, os, sys
 import datetime, time
 import subprocess
 
-from pandora_plugin_config import *
+plugin_am_file=None
+plugin_ac_file=None
 
 class ChangeProtectedFile(object):
 
@@ -40,7 +42,7 @@
       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 
+  # 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."""
@@ -111,6 +113,8 @@
 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 "---"
@@ -139,12 +143,11 @@
 %(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=%(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_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):
@@ -169,23 +172,22 @@
     if plugin['writing_status'] == 'done':
       return
     else:
-      print "Dependency loop detected with " % plugin['name']
+      print "Dependency loop detected with %s" % plugin['name']
       exit(1)
 
   plugin['writing_status'] = 'dependencies'
 
   # Write all dependencies first to get around annoying automake bug
-  if plugin['dependency_list'] is not None:
-    for dependency in plugin['dependency_list']:
-      found = False
-      for find_plugin in plugin_ini_list:
-        if find_plugin['name'] == dependency:
-          found = True
-          write_plugin(find_plugin, plugin_ini_list)
-          break
-      if found is False:
-        print "Could not find dependency %s" % dependency
-        exit(1)
+  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)
@@ -209,22 +211,7 @@
     plugin_ac.write('m4_sinclude([%s])\n' % m4_file)
   plugin['plugin_dep_libs']=" ".join(["\${top_builddir}/%s" % f for f in plugin['libs'].split()])
 
-  if plugin['static']:
-    plugin_ac.write("""
-dnl This plugin is staticly built, which means we cannot live without and it is not
-dnl possible to disable it. Once it is disableable, we will make it non-static.
-with_%(name)s_plugin=yes
-pandora_builtin_list="_drizzled_%(name)s_plugin_,${pandora_builtin_list}"
-pandora_plugin_libs="${pandora_plugin_libs} \${top_builddir}/%(root_plugin_dir)s/%(libname)s.la"
-PANDORA_PLUGIN_DEP_LIBS="${PANDORA_PLUGIN_DEP_LIBS} %(plugin_dep_libs)s"
-
-""" % plugin)
-    if plugin['testsuite']:
-      plugin_ac.write("""
-pandora_plugin_test_list="%(name)s,${pandora_plugin_test_list}"
-""" % plugin)
-  else:
-    plugin_ac.write("""
+  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@:>@])
@@ -245,14 +232,14 @@
 AS_HELP_STRING([--enable-%(name_with_dashes)s-plugin],[Build %(title)s. @<:@default=%(default_yesno)s@:>@])
 AS_HELP_STRING([--disable-%(name_with_dashes)s-plugin],[Disable building %(title)s])
   ],
-  [enable_%(name)s_plugin="$withval"],
+  [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) 
+    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 
+  # 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
@@ -272,23 +259,46 @@
 AM_CONDITIONAL([%(build_conditional_tag)s],
                [test %(build_conditional)s])
     """ % plugin)
-  if not plugin['static']:
-    plugin_ac.write("""
+
+  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)
+  if plugin['testsuite']:
+    plugin_ac.write("""
+      pandora_plugin_test_list="%(name)s,${pandora_plugin_test_list}"
+    """ % plugin)
+  if plugin['static']:
+    plugin_ac.write("""
+        AS_IF([test "x$enable_%(name)s_plugin" = "xyes"],[
+          pandora_builtin_list="_drizzled_%(module_name)s_plugin_,${pandora_builtin_list}"
+          pandora_plugin_libs="${pandora_plugin_libs} \${top_builddir}/%(root_plugin_dir)s/%(libname)s.la"
+          PANDORA_PLUGIN_DEP_LIBS="${PANDORA_PLUGIN_DEP_LIBS} %(plugin_dep_libs)s"
+        ])
+    """ % plugin)
 
+  else:
     plugin_ac.write("""
         AS_IF([test "x$enable_%(name)s_plugin" = "xyes"],[
           pandora_default_plugin_list="%(name)s,${pandora_default_plugin_list}"
         ])
     """ % plugin)
-    plugin_ac.write("      ])\n")
+  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**":
@@ -299,53 +309,22 @@
       plugin['rel_path']= plugin['plugin_dir']
       plugin['unconditional']=True
     else:
-      plugin['rel_path']= plugin['plugin_dir'][len(top_srcdir)+len(os.path.sep):]
+      plugin['rel_path']= plugin['plugin_dir'][len(config['top_srcdir'])+len(os.path.sep):]
       plugin['unconditional']=False
-    # TODO: determine path to plugin dir relative to top_srcdir... append it to
-    # source files if they don't already have it
-    if plugin['sources'] == "":
-      plugin['sources']="%s.cc" % plugin['name']
-    new_sources=""
-    if plugin['plugin_dir'] != ".":
-      for src in plugin['sources'].split():
-        if not src.startswith(plugin['rel_path']):
-          src= os.path.join(plugin['rel_path'], src)
-          new_sources= "%s %s" % (new_sources, src)
-    else:
-      new_sources= " ".join(plugin['sources'].split())
-    if new_sources != "":
-      plugin['sources']= new_sources
+
+    plugin['sources']= fix_file_paths(plugin, plugin['sources'])
     plugin['main_source']= plugin['sources'].split()[0]
-    
-    new_headers=""
-    if plugin['plugin_dir'] != ".":
-      for header in plugin['headers'].split():
-        if not header.startswith(plugin['rel_path']):
-          header= os.path.join(plugin['rel_path'], header)
-          new_headers= "%s %s" % (new_headers, header)
-    else:
-      new_headers= " ".join(plugin['headers'].split())
-    if new_headers != "":
-      plugin['headers']= new_headers
-    
-    new_install_headers=""
-    if plugin['plugin_dir'] != ".":
-      for header in plugin['install_headers'].split():
-        if not header.startswith(plugin['rel_path']):
-          header= os.path.join(plugin['rel_path'], header)
-          new_install_headers= "%s %s" % (new_install_headers, header)
-    else:
-      new_install_headers= " ".join(plugin['install_headers'].split())
-    if new_install_headers != "":
-      plugin['install_headers']= new_install_headers
-    
+    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']:
+    if plugin['load_by_default'] or plugin['static']:
       plugin['default_yesno']="yes"
     else:
       plugin['default_yesno']="no"
 
-    
+
     plugin['build_conditional_tag']= "BUILD_%s_PLUGIN" % plugin['name'].upper()
     plugin['name_with_dashes']= plugin['name'].replace('_','-')
     if plugin.has_key('build_conditional'):
@@ -356,9 +335,9 @@
       plugin['build_conditional']='"x${with_%(name)s_plugin}" = "xyes"' %plugin
 
     if plugin['install']:
-      plugin['library_type']= 'pkgplugin';
+      plugin['library_type']= 'pkgplugin'
     else:
-      plugin['library_type']= 'noinst';
+      plugin['library_type']= 'noinst'
 
 def find_testsuite(plugin_dir):
   for testdir in ['drizzle-tests','tests']:
@@ -372,10 +351,14 @@
     if plugin_dir == ".":
       plugin_name="**OUT-OF-TREE**"
     else:
-      plugin_name=os.path.basename(plugin_dir)
-
-    plugin_file= os.path.join(plugin_dir,plugin_ini_fname)
-    plugin_defaults= dict(sources="",
+      short_name=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="%s.cc" % short_name,
                           headers="",
                           install_headers="",
                           cflags="",
@@ -388,12 +371,14 @@
                           description="",
                           license="PLUGIN_LICENSE_GPL",
                           name=plugin_name,
-                          load_by_default="False",
+                          module_name=module_name,
+                          load_by_default=config['default_load_by_default'],
                           disabled="False",
                           static="False",
                           dependencies="",
                           dependency_aliases="",
-                          install=default_install)
+                          tests="",
+                          install=config['default_install'])
     parser=ConfigParser.ConfigParser(defaults= plugin_defaults)
     parser.read(plugin_file)
     plugin=dict(parser.items('plugin'))
@@ -407,8 +392,8 @@
         print "External Plugins are required to specifiy a version"
         sys.exit(1)
     if not plugin.has_key('version'):
-      plugin['version'] = default_plugin_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'):
@@ -432,30 +417,32 @@
       else:
         plugin['testsuite']=False
 
-    plugin['cflags']+= extra_cflags
-    plugin['cppflags']+= extra_cppflags
-    plugin['cxxflags']+= extra_cxxflags
+    plugin['cflags']+= ' ' + config['extra_cflags']
+    plugin['cppflags']+= ' ' + config['extra_cppflags']
+    plugin['cxxflags']+= ' ' + config['extra_cxxflags']
 
-    plugin['libname']= "lib%s%s%s" % (plugin_prefix, plugin['name'], plugin_suffix)
-    if force_lowercase_libname:
+    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']= root_plugin_dir
-    plugin['plugin_prefix']= plugin_prefix
-    plugin['plugin_suffix']= plugin_suffix
-    plugin['pkgplugindir']= pkgplugindir
+    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['dependencies'] = plugin['dependencies'].replace(' ', '')
-    plugin['dependency_aliases'] = plugin['dependency_aliases'].replace(' ', '')
-    if plugin['dependencies'] == '':
-      plugin['dependency_list'] = None
-      plugin['dependencies'] = plugin['dependency_aliases']
-    else:
-      plugin['dependency_list'] = plugin['dependencies'].split(',')
-      if plugin['dependency_aliases'] != '':
-        plugin['dependencies'] = ','.join([plugin['dependencies'], plugin['dependency_aliases']])
+    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"'
@@ -470,7 +457,7 @@
 
 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.
   """
@@ -499,11 +486,11 @@
   %(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=%(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_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
 """ % plugin)
@@ -516,27 +503,55 @@
   %(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=%(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_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:
+#
+# 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())
-    default_plugin_version = "%d.%02d.%s" % (rev_date.year, rev_date.month, bzr_revno)
+    config['default_plugin_version'] = "%d.%02d.%s" % (rev_date.year, rev_date.month, bzr_revno)
   else:
-    default_plugin_version=datetime.date.fromtimestamp(time.time()).isoformat()
+    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()
@@ -549,14 +564,14 @@
     elif revno_key == 'PANDORA_RELEASE_DATE':
       rev_date=revno_val.strip()
 
-  default_plugin_version = "%s.%s" % (rev_date, bzr_revno)
+  config['default_plugin_version'] = "%s.%s" % (rev_date, bzr_revno)
 
 actions=[]
 for arg in sys.argv:
   if arg.startswith('--top_srcdir='):
-    top_srcdir=arg[12:]
+    config['top_srcdir']=arg[12:]
   elif arg.startswith('--top_builddir='):
-    top_builddir=arg[14:]
+    config['top_builddir']=arg[14:]
   elif arg == "--force-all":
     actions=['plugin-list','pandora-plugin.am','write']
     break
@@ -565,11 +580,17 @@
 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 plugin_ini_fname in fnames:
+  if config['plugin_ini_fname'] in fnames:
     arg.append(dirname)
-os.path.walk(os.path.join(top_srcdir,root_plugin_dir),accumulate_plugins,plugin_list)
+
+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:
@@ -589,7 +610,7 @@
 	config/pandora-plugin.am \
 	config/pandora-plugin.ac \
 	config/pandora-plugin \
-	config/pandora_plugin_config.py
+	config/pandora-plugin.ini
 
 
 # Seed the list of plugin LDADDS which plugins may extend.
@@ -629,6 +650,13 @@
     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)
 

=== renamed file 'config/pandora_plugin_config.py' => 'config/pandora-plugin.ini'
--- config/pandora_plugin_config.py	2010-04-16 00:08:16 +0000
+++ config/pandora-plugin.ini	2010-05-13 16:14:25 +0000
@@ -1,33 +1,7 @@
-#!/usr/bin/python
-
-#  Copyright (C) 2009 Sun Microsystems
-#
-#  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
-
-top_srcdir='.'
-top_builddir='.'
-plugin_ini_fname='plugin.ini'
-plugin_list=[]
-plugin_am_file=None
-plugin_ac_file=None
-plugin_prefix=''
-plugin_suffix='_plugin'
-extra_cflags=''
-extra_cppflags=''
-extra_cxxflags=' -DBUILDING_DRIZZLE'
-root_plugin_dir='plugin'
-pkgplugindir='$(libdir)/drizzle'
-default_install='True'
-default_plugin_version=''
+[pandora-plugin]
+root_plugin_dir=plugin
+pkgplugindir=$(libdir)/drizzle
+plugin_suffix=_plugin
+extra_cxxflags=-DBUILDING_DRIZZLE
 force_lowercase_libname=True
+plugin_ini_fname=plugin.ini

=== modified file 'config/uncrustify.cfg'
--- config/uncrustify.cfg	2009-08-28 03:36:57 +0000
+++ config/uncrustify.cfg	2010-05-13 16:14:25 +0000
@@ -1,5 +1,5 @@
 #
-# Uncrustify optoins (with comments) for Drizzle
+# Uncrustify options (with comments) for Pandora Projects
 #
 
 nl_after_brace_close = TRUE

=== modified file 'm4/ac_cxx_header_stdcxx_98.m4'
--- m4/ac_cxx_header_stdcxx_98.m4	2009-01-09 19:40:29 +0000
+++ m4/ac_cxx_header_stdcxx_98.m4	2010-05-13 16:14:25 +0000
@@ -1,12 +1,28 @@
-dnl Copyright © 2008 Benjamin Kosnik <[e-mail]>
-
-dnl 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.
-
+# ===========================================================================
+#        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_PUSH(C++)
+  [AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
   AC_TRY_COMPILE([
     #include <cassert>
     #include <cctype>
@@ -59,7 +75,7 @@
     #include <vector>
   ],,
   ac_cv_cxx_stdcxx_98=yes, ac_cv_cxx_stdcxx_98=no)
-  AC_LANG_POP()
+  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. ])

=== modified file 'm4/acx_pthread.m4'
--- m4/acx_pthread.m4	2009-07-26 18:58:41 +0000
+++ m4/acx_pthread.m4	2010-05-13 16:14:25 +0000
@@ -1,4 +1,6 @@
-##### http://autoconf-archive.cryp.to/acx_pthread.html
+# ===========================================================================
+#              http://autoconf-archive.cryp.to/acx_pthread.html
+# ===========================================================================
 #
 # SYNOPSIS
 #
@@ -6,87 +8,77 @@
 #
 # DESCRIPTION
 #
-#   This macro figures out how to build C programs using POSIX threads.
-#   It sets the PTHREAD_LIBS output variable to the threads library and
-#   linker flags, and the PTHREAD_CFLAGS output variable to any special
-#   C compiler flags that are needed. (The user can also force certain
-#   compiler flags/libs to be tested by setting these environment
-#   variables.)
+#   This macro figures out how to build C programs using POSIX threads. It
+#   sets the PTHREAD_LIBS output variable to the threads library and linker
+#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
+#   flags that are needed. (The user can also force certain compiler
+#   flags/libs to be tested by setting these environment variables.)
 #
 #   Also sets PTHREAD_CC to any special C compiler that is needed for
-#   multi-threaded programs (defaults to the value of CC otherwise).
-#   (This is necessary on AIX to use the special cc_r compiler alias.)
-#
-#   NOTE: You are assumed to not only compile your program with these
-#   flags, but also link it with them as well. e.g. you should link
-#   with $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS
-#   $LIBS
-#
-#   If you are only building threads programs, you may wish to use
-#   these variables in your default LIBS, CFLAGS, and CC:
+#   multi-threaded programs (defaults to the value of CC otherwise). (This
+#   is necessary on AIX to use the special cc_r compiler alias.)
+#
+#   NOTE: You are assumed to not only compile your program with these flags,
+#   but also link it with them as well. e.g. you should link with
+#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
+#
+#   If you are only building threads programs, you may wish to use these
+#   variables in your default LIBS, CFLAGS, and CC:
 #
 #          LIBS="$PTHREAD_LIBS $LIBS"
 #          CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 #          CC="$PTHREAD_CC"
 #
-#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute
-#   constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to
-#   that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-#
-#   ACTION-IF-FOUND is a list of shell commands to run if a threads
-#   library is found, and ACTION-IF-NOT-FOUND is a list of commands to
-#   run it if it is not found. If ACTION-IF-FOUND is not specified, the
-#   default action will define HAVE_PTHREAD.
-#
-#   Please let the authors know if this macro fails on any platform, or
-#   if you have any other suggestions or comments. This macro was based
-#   on work by SGJ on autoconf scripts for FFTW (http://www.fftw.org/)
-#   (with help from M. Frigo), as well as ac_pthread and hb_pthread
-#   macros posted by Alejandro Forero Cuervo to the autoconf macro
-#   repository. We are also grateful for the helpful feedback of
-#   numerous users.
-#
-# LAST MODIFICATION
-#
-#   2006-05-29
-#
-# COPYLEFT
-#
-#   Copyright (c) 2006 Steven G. Johnson <[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.
+#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
+#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
+#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+#
+#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
+#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
+#   is not found. If ACTION-IF-FOUND is not specified, the default action
+#   will define HAVE_PTHREAD.
+#
+#   Please let the authors know if this macro fails on any platform, or if
+#   you have any other suggestions or comments. This macro was based on work
+#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
+#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
+#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
+#   grateful for the helpful feedback of numerous users.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Steven G. Johnson <[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 3 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., 59 Temple Place - Suite 330, Boston, MA
-#   02111-1307, USA.
-#
-#   As a special exception, the respective Autoconf Macro's copyright
-#   owner gives unlimited permission to copy, distribute and modify the
-#   configure scripts that are the output of Autoconf when processing
-#   the Macro. You need not follow the terms of the GNU General Public
-#   License when using or distributing such scripts, even though
-#   portions of the text of the Macro appear in them. The GNU General
-#   Public License (GPL) does govern all other use of the material that
-#   constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the
-#   Autoconf Macro released by the Autoconf Macro Archive. When you
-#   make and distribute a modified version of the Autoconf Macro, you
-#   may extend this special exception to the GPL to apply to your
-#   modified version as well.
+#   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, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
 
 AC_DEFUN([ACX_PTHREAD], [
 AC_REQUIRE([AC_CANONICAL_HOST])
-AC_LANG_PUSH([C])
+AC_LANG_SAVE
+AC_LANG_C
 acx_pthread_ok=no
 
 # We used to check for pthread.h first, but this fails if pthread.h
@@ -199,9 +191,11 @@
         # pthread_cleanup_push because it is one of the few pthread
         # functions on Solaris that doesn't have a non-functional libc stub.
         # We try pthread_create on general principles.
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], [[pthread_t th; pthread_join(th, 0);
+        AC_TRY_LINK([#include <pthread.h>],
+                    [pthread_t th; pthread_join(th, 0);
                      pthread_attr_init(0); pthread_cleanup_push(0, 0);
-                     pthread_create(0,0,0,0); pthread_cleanup_pop(0); ]])],[acx_pthread_ok=yes],[])
+                     pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
+                    [acx_pthread_ok=yes])
 
         LIBS="$save_LIBS"
         CFLAGS="$save_CFLAGS"
@@ -227,7 +221,8 @@
 	AC_MSG_CHECKING([for joinable pthread attribute])
 	attr_name=unknown
 	for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-	    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], [[int attr=$attr; return attr;]])],[attr_name=$attr; break],[])
+	    AC_TRY_LINK([#include <pthread.h>], [int attr=$attr; return attr;],
+                        [attr_name=$attr; break])
 	done
         AC_MSG_RESULT($attr_name)
         if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
@@ -272,5 +267,5 @@
         acx_pthread_ok=no
         $2
 fi
-AC_LANG_POP([])
+AC_LANG_RESTORE
 ])dnl ACX_PTHREAD

=== modified file 'm4/pandora_canonical.m4'
--- m4/pandora_canonical.m4	2010-04-20 20:22:03 +0000
+++ m4/pandora_canonical.m4	2010-05-13 16:14:25 +0000
@@ -4,7 +4,7 @@
 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.123])
+AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.127])
 
 AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
   AC_ARG_ENABLE([fat-binaries],

=== modified file 'plugin/archive/plugin.am'
--- plugin/archive/plugin.am	2009-12-29 18:26:43 +0000
+++ plugin/archive/plugin.am	2010-05-13 16:14:25 +0000
@@ -20,7 +20,9 @@
 			$(LIBINTL) \
 			$(LTLIBZ)
 
+if BUILD_ARCHIVE_PLUGIN
 noinst_LTLIBRARIES+=  plugin/archive/libazio.la
+endif
 noinst_HEADERS+= \
                  plugin/archive/azio.h
 plugin_archive_libazio_la_SOURCES= \

=== modified file 'plugin/heap/plugin.am'
--- plugin/heap/plugin.am	2009-11-10 20:47:10 +0000
+++ plugin/heap/plugin.am	2010-05-13 16:14:25 +0000
@@ -1,3 +1,4 @@
+# vim:ft=automake
 # Copyright (C) 2000-2002, 2005-2006 MySQL AB
 # 
 # This program is free software; you can redistribute it and/or modify
@@ -13,7 +14,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+if BUILD_MEMORY_PLUGIN
 noinst_LTLIBRARIES+=	plugin/heap/libheap.la
+endif
 noinst_HEADERS+= \
 			plugin/heap/ha_heap.h \
 			plugin/heap/heap.h \

=== modified file 'plugin/innobase/plugin.am'
--- plugin/innobase/plugin.am	2010-03-01 16:43:50 +0000
+++ plugin/innobase/plugin.am	2010-05-13 16:14:25 +0000
@@ -215,8 +215,12 @@
                  plugin/innobase/handler/status_function.h \
                  plugin/innobase/handler/data_dictionary.h
 
+if BUILD_INNOBASE_PLUGIN
 noinst_LTLIBRARIES+= \
-                     plugin/innobase/libinnobase.la plugin/innobase/libpars.la
+                     plugin/innobase/libinnobase.la \
+		     plugin/innobase/libpars.la
+endif
+
 plugin_innobase_libinnobase_la_CFLAGS=	${AM_CFLAGS} ${INNOBASE_SKIP_WARNINGS} -I$(top_srcdir)/plugin/innobase/include -DBUILD_DRIZZLE
 plugin_innobase_libinnobase_la_CXXFLAGS=${AM_CXXFLAGS} ${INNOBASE_SKIP_WARNINGS} -I$(top_srcdir)/plugin/innobase/include -DBUILD_DRIZZLE
 plugin_innobase_libinnobase_la_SOURCES= \

=== modified file 'plugin/myisam/plugin.am'
--- plugin/myisam/plugin.am	2009-10-13 06:22:10 +0000
+++ plugin/myisam/plugin.am	2010-05-13 16:14:25 +0000
@@ -1,3 +1,4 @@
+# vim:ft=automake
 #  Copyright (C) 2009 Sun Microsystems
 #
 #  This program is free software; you can redistribute it and/or modify
@@ -13,7 +14,9 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+if BUILD_MYISAM_PLUGIN
 noinst_LTLIBRARIES+=	plugin/myisam/libmyisam.la 
+endif
 noinst_HEADERS+=	\
 			plugin/myisam/ha_myisam.h \
 			plugin/myisam/keycache.h \

=== modified file 'plugin/pbxt/plugin.am'
--- plugin/pbxt/plugin.am	2010-04-14 17:24:09 +0000
+++ plugin/pbxt/plugin.am	2010-05-13 16:14:25 +0000
@@ -1,6 +1,8 @@
 # Used to build Makefile.in
 
+if BUILD_PBXT_PLUGIN
 noinst_LTLIBRARIES+= 		plugin/pbxt/libpbxt.la
+endif
 
 noinst_HEADERS+= \
                  plugin/pbxt/src/backup_xt.h \