← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to m4/pandora_plugins.m4

  • Committer: Padraig O'Sullivan
  • Date: 2009-09-13 01:03:01 UTC
  • mto: (1126.9.2 captain-20090915-01)
  • mto: This revision was merged to the branch mainline in revision 1133.
  • Revision ID: osullivan.padraig@gmail.com-20090913010301-tcvvezipx1124acy
Added calls to the dtrace delete begin/end probes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/pandora_plugins.m4
9
9
 
10
10
AC_DEFUN([PANDORA_PLUGINS],[
11
11
 
12
 
  dnl We do this to prime the files from a fresh checkout. Normally we want
13
 
  dnl these commands to be executed by make. Perhaps we should split them into
14
 
  dnl a few shell script snippets in config and make Make call them... we're
15
 
  dnl going to get there...
16
 
  dnl ANYWAY - syscmd gets called during aclocal - so before automake. It will
17
 
  dnl get called probably during autoconf too, so it's important to protect
18
 
  dnl with test -f ... if the files exist, we don't have the chicken/egg 
19
 
  dnl problem and therefore don't need to do anything here
20
 
  m4_syscmd([python config/pandora-plugin > /dev/null])
21
 
  m4_syscmd([test -f config/plugin.stamp || touch config/plugin.stamp aclocal.m4])
22
 
 
23
 
  m4_sinclude(config/pandora-plugin.ac)
24
 
 
 
12
  m4_sinclude(config/plugin.ac)
25
13
  dnl Add code here to read set plugin lists and  set drizzled_default_plugin_list
 
14
  AC_DEFINE_UNQUOTED([PANDORA_PLUGIN_LIST],[$pandora_default_plugin_list],
 
15
                     [List of plugins that should be loaded on startup if no
 
16
                      value is given for --plugin-load])
 
17
 
26
18
  pandora_builtin_list=`echo $pandora_builtin_list | sed 's/, *$//'`
27
 
  AS_IF([test "x$pandora_builtin_list" = "x"], pandora_builtin_list="NULL")
28
 
  AC_SUBST([PANDORA_BUILTIN_LIST],[$pandora_builtin_list])
29
 
  AC_SUBST([PANDORA_PLUGIN_LIST],[$pandora_default_plugin_list])
30
 
  m4_ifval(m4_normalize([$1]),[
31
 
    AC_CONFIG_FILES($*)
32
 
    ],[
33
 
    AC_DEFINE_UNQUOTED([PANDORA_BUILTIN_LIST],[$pandora_builtin_list],
34
 
                       [List of plugins to be built in])
35
 
    AC_DEFINE_UNQUOTED([PANDORA_PLUGIN_LIST],["$pandora_default_plugin_list"],
36
 
                       [List of plugins that should be loaded on startup if no
37
 
                        value is given for --plugin-load])
38
 
  ])
39
 
 
 
19
  AC_DEFINE_UNQUOTED([PANDORA_BUILTIN_LIST],[$pandora_builtin_list],
 
20
                     [List of plugins to be built in])
40
21
 
41
22
  AC_SUBST(pandora_plugin_test_list)
42
23
  AC_SUBST(pandora_plugin_libs)
45
26
  AC_SUBST(pandora_plugin_defs)
46
27
 
47
28
  AC_SUBST(PANDORA_PLUGIN_DEP_LIBS)
48
 
  AC_SUBST(pkgplugindir,"\$(pkglibdir)")
 
29
  AC_SUBST(pkgplugindir,"\$(pkglibdir)/plugin")
49
30
])
50
31
 
51
32
AC_DEFUN([PANDORA_ADD_PLUGIN_DEP_LIB],[