← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to m4/pandora_plugins.m4

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-10-02 14:17:48 UTC
  • mfrom: (1.1.1 upstream)
  • mto: (2.1.17 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20101002141748-m6vbfbfjhrw1153e
Tags: 2010.09.1802-1
* New upstream release.
* Removed pid-file argument hack.
* Updated GPL-2 address to be new address.
* Directly copy in drizzledump.1 since debian doesn't have sphinx 1.0 yet.
* Link to jquery from libjs-jquery. Add it as a depend.
* Add drizzled.8 symlink to the install files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/pandora_plugins.m4
24
24
 
25
25
  dnl Add code here to read set plugin lists and  set drizzled_default_plugin_list
26
26
  pandora_builtin_list=`echo $pandora_builtin_list | sed 's/, *$//'`
27
 
  AS_IF([test "x$pandora_builtin_list" = "x"], pandora_builtin_list="NULL")
 
27
  pandora_builtin_symbols_list=`echo $pandora_builtin_symbols_list | sed 's/, *$//'`
 
28
  AS_IF([test "x$pandora_builtin_symbols_list" = "x"], pandora_builtin_symbols_list="NULL")
28
29
  AC_SUBST([PANDORA_BUILTIN_LIST],[$pandora_builtin_list])
 
30
  AC_SUBST([PANDORA_BUILTIN_SYMBOLS_LIST],[$pandora_builtin_symbols_list])
29
31
  AC_SUBST([PANDORA_PLUGIN_LIST],[$pandora_default_plugin_list])
30
32
  m4_ifval(m4_normalize([$1]),[
31
33
    AC_CONFIG_FILES($*)
32
34
    ],[
33
 
    AC_DEFINE_UNQUOTED([PANDORA_BUILTIN_LIST],[$pandora_builtin_list],
 
35
    AC_DEFINE_UNQUOTED([PANDORA_BUILTIN_LIST],["$pandora_builtin_list"],
34
36
                       [List of plugins to be built in])
 
37
    AC_DEFINE_UNQUOTED([PANDORA_BUILTIN_SYMBOLS_LIST],["$pandora_builtin_symbols_list"],
 
38
                       [List of builtin plugin symbols to be built in])
35
39
    AC_DEFINE_UNQUOTED([PANDORA_PLUGIN_LIST],["$pandora_default_plugin_list"],
36
40
                       [List of plugins that should be loaded on startup if no
37
41
                        value is given for --plugin-load])
45
49
  AC_SUBST(pandora_plugin_defs)
46
50
 
47
51
  AC_SUBST(PANDORA_PLUGIN_DEP_LIBS)
48
 
  AC_SUBST(pkgplugindir,"\$(pkglibdir)/plugin")
 
52
  AC_SUBST(pkgplugindir,"\$(pkglibdir)")
49
53
])
50
54
 
51
55
AC_DEFUN([PANDORA_ADD_PLUGIN_DEP_LIB],[