Fix problem building external plugins

The file plugin.h is installed to $prefix/include and used by external
plugins.  Therefore it must not include, or depend on, features set by
the configure script in config.h

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson committed 2018-01-15 15:07:24 +01:00
1 parent c616270ccb
commit d35a8bbda9
4 files changed
+4 -9

No files matched your search

+1 -1
View File
@@ -320,7 +320,7 @@ int main(int argc, char* argv[])
* Load plugins early, finit.conf may contain references to * Load plugins early, finit.conf may contain references to
* features implemented by plugins. * features implemented by plugins.
*/ */
plugin_init(&loop, PLUGIN_PATH); plugin_init(&loop);
/* /*
* Hello world. * Hello world.
+2 -2
View File
@@ -382,11 +382,11 @@ static int load_plugins(char *path)
} }
#endif /* ENABLE_STATIC */ #endif /* ENABLE_STATIC */
int plugin_init(uev_ctx_t *ctx, char *path) int plugin_init(uev_ctx_t *ctx)
{ {
int fail = 1; int fail = 1;
if (!load_plugins(path)) if (!load_plugins(PLUGIN_PATH))
fail = init_plugins(ctx); fail = init_plugins(ctx);
return fail; return fail;
-5
View File
@@ -24,16 +24,11 @@
#ifndef FINIT_PLUGIN_H_ #ifndef FINIT_PLUGIN_H_
#define FINIT_PLUGIN_H_ #define FINIT_PLUGIN_H_
#include <config.h>
#include <uev/uev.h> #include <uev/uev.h>
#include <lite/queue.h> /* BSD sys/queue.h API */ #include <lite/queue.h> /* BSD sys/queue.h API */
#include "svc.h" #include "svc.h"
#ifndef PLUGIN_PATH /* Fallback for --enable-static builds */
#define PLUGIN_PATH "/dev/null"
#endif
#define PLUGIN_DEP_MAX 10 #define PLUGIN_DEP_MAX 10
/* /*
+1 -1
View File
@@ -45,7 +45,7 @@ int plugin_exists (hook_point_t no);
void plugin_run_hook (hook_point_t no, void *arg); void plugin_run_hook (hook_point_t no, void *arg);
void plugin_run_hooks (hook_point_t no); void plugin_run_hooks (hook_point_t no);
int plugin_init (uev_ctx_t *ctx, char *path); int plugin_init (uev_ctx_t *ctx);
void plugin_exit (void); void plugin_exit (void);
#endif /* FINIT_PRIVATE_H_ */ #endif /* FINIT_PRIVATE_H_ */