X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fpandora_plugins.m4;h=75e3732959f491b5ee2870b5d5b02d9d633c7b0a;hb=c472631907d070a97d80df05ac3c42a99736a9b6;hp=53b5ebfd59eabbd2b5050746ee22a9d3ccdd979d;hpb=1b18496b3d1399d90cfba1975f23aee9c747445a;p=m6w6%2Flibmemcached

diff --git a/m4/pandora_plugins.m4 b/m4/pandora_plugins.m4
index 53b5ebfd..75e37329 100644
--- 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)