← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to config/pandora-plugin

  • Committer: Lee Bieber
  • Date: 2010-10-29 13:35:47 UTC
  • mfrom: (1890.1.3 build)
  • Revision ID: kalebral@gmail.com-20101029133547-ehu44so1ij4cylr5
Merge Shrews - fix bug 667288: Transaction_reader reporting error about dangerously large protobuf message
Merge Monty - fix bug 667598: static plugins should be addable via plugin-add   
Merge Brian - clean up C++ warnings

Show diffs side-by-side

added added

removed removed

Lines of Context:
config/pandora-plugin
280
280
  if plugin['static']:
281
281
    plugin_ac.write("""
282
282
        AS_IF([test "x$enable_%(name)s_plugin" = "xyes"],[
283
 
          pandora_builtin_list="%(module_name)s,${pandora_builtin_list}"
284
 
          pandora_builtin_symbols_list="_drizzled_%(module_name)s_plugin_,${pandora_builtin_symbols_list}"
285
 
          pandora_plugin_libs="${pandora_plugin_libs} \${top_builddir}/%(root_plugin_dir)s/%(libname)s.la"
 
283
          pandora_builtin_load_list="%(module_name)s,${pandora_builtin_load_list}"
 
284
          pandora_builtin_load_symbols_list="_drizzled_%(module_name)s_plugin_,${pandora_builtin_load_symbols_list}"
286
285
          PANDORA_PLUGIN_DEP_LIBS="${PANDORA_PLUGIN_DEP_LIBS} %(plugin_dep_libs)s"
287
286
        ])
 
287
        pandora_builtin_list="%(module_name)s,${pandora_builtin_list}"
 
288
        pandora_builtin_symbols_list="_drizzled_%(module_name)s_plugin_,${pandora_builtin_symbols_list}"
 
289
        pandora_plugin_libs="${pandora_plugin_libs} \${top_builddir}/%(root_plugin_dir)s/%(libname)s.la"
288
290
    """ % plugin)
289
291
 
290
292
  else: