aboutsummaryrefslogtreecommitdiffstats
path: root/epan/epan.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/epan.c')
-rw-r--r--epan/epan.c32
1 files changed, 30 insertions, 2 deletions
diff --git a/epan/epan.c b/epan/epan.c
index 2dd19ac811..98b87d9cc2 100644
--- a/epan/epan.c
+++ b/epan/epan.c
@@ -1,3 +1,10 @@
+/* epan.h
+ *
+ * $Id: epan.c,v 1.4 2000/10/16 23:17:39 guy Exp $
+ *
+ * Ethereal Protocol Analyzer Library
+ *
+ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -14,8 +21,29 @@
#include "proto.h"
#include "tvbuff.h"
+/*
+ * XXX - this takes the plugin directory as an argument, because
+ * libethereal now has its own configure script and "config.h" file,
+ * which is what code in the "epan" directory includes, but we need
+ * to define PLUGIN_DIR in the top-level directory, as it's used by,
+ * for example, the Makefile for the Gryphon plugin, so it knows
+ * where to install the plugin.
+ *
+ * Eventually, we should probably have an "epan-configure" script
+ * (or "libethereal-configure", or whatever), along the lines of what
+ * GTK+ and GLib have, that can print, among other things, the directory
+ * into which plugins should be installed. That way, only libethereal
+ * need know what directory that is; programs using it won't, *and*
+ * Makefiles for plugins can just use "epan-configure" to figure out
+ * where to install the plugins.
+ *
+ * (Would that *more* libraries had configure scripts like that, so
+ * that configure scripts didn't have to go through various contortions
+ * to figure out where the header files and libraries for various
+ * libraries are located.)
+ */
void
-epan_init(void)
+epan_init(const char *plugin_dir)
{
except_init();
tvbuff_init();
@@ -23,7 +51,7 @@ epan_init(void)
proto_init();
dfilter_init();
#ifdef HAVE_PLUGINS
- init_plugins();
+ init_plugins(plugin_dir);
#endif
}