pandora-build v0.61

[awesomized/libmemcached] / m4 / pandora_plugins.m4

diff --git a/m4/pandora_plugins.m4 b/m4/pandora_plugins.m4
index c4df08dc6efb69afbf8a4384347b78d32aed9359..75e3732959f491b5ee2870b5d5b02d9d633c7b0a 100644 (file)
--- a/m4/pandora_plugins.m4
+++ b/m4/pandora_plugins.m4
@@ -9,15 +9,22 @@ dnl--------------------------------------------------------------------
 
 AC_DEFUN([PANDORA_PLUGINS],[
 
-  m4_include(config/plugin.ac)
+  m4_sinclude(config/plugin.ac)
   dnl Add code here to read set plugin lists and  set drizzled_default_plugin_list
   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])
 
   pandora_builtin_list=`echo $pandora_builtin_list | sed 's/, *$//'`
-  AC_DEFINE_UNQUOTED([PANDORA_BUILTIN_LIST],[$pandora_builtin_list],
-                     [List of plugins to be built in])
+  AS_IF([test "x$pandora_builtin_list" = "x"], pandora_builtin_list="NULL")
+  AC_SUBST([PANDORA_BUILTIN_LIST],[$pandora_builtin_list])
+  m4_ifval(m4_normalize([$1]),[
+    AC_CONFIG_FILES($*)
+    ],[
+    AC_DEFINE_UNQUOTED([PANDORA_BUILTIN_LIST],[$pandora_builtin_list],
+                       [List of plugins to be built in])
+  ])
+
 
   AC_SUBST(pandora_plugin_test_list)
   AC_SUBST(pandora_plugin_libs)
@@ -31,4 +38,4 @@ AC_DEFUN([PANDORA_PLUGINS],[
 
 AC_DEFUN([PANDORA_ADD_PLUGIN_DEP_LIB],[
   PANDORA_PLUGIN_DEP_LIBS="${PANDORA_PLUGIN_DEP_LIBS} $*"
-])
\ No newline at end of file
+])