Add a WIRESHARK_RUN_FROM_BUILD_DIRECTORY environment variable on UN*X;

if set, and if the program isn't running with additional privileges,
it'll treat the directory in which the program is found as the data
directory.

If, on Windows, the version-number subdirectory of {data
directory}\plugins doesn't exist (which is assumed to mean that the
program is being run from the build directory), or if, on UN*X,
WIRESHARK_RUN_FROM_BUILD_DIRECTORY is set, the plugin directory is the
"plugins" subdirectory of the data directory, and all subdirectories of
that directory are scanned for plugins, as the "plugins" subdirectory of
the build directory contains subdirectories for the plugins; this means
that if we're running from the build directory, we'll find the plugins
we built in the build tree.

When generating the wireshark-filter man page, run tshark with
WIRESHARK_RUN_FROM_BUILD_DIRECTORY set, so it uses the plugins from the
build to generate the list of filters.

svn path=/trunk/; revision=20261

1 files changed, 1 insertions, 5 deletions

diff --git a/epan/plugins.h b/epan/plugins.h
index 44d942fbc8..f806522cf9 100644
--- a/epan/plugins.h
+++ b/epan/plugins.h
@@ -42,14 +42,10 @@ typedef struct _plugin {
 
 WS_VAR_IMPORT plugin *plugin_list;
 
-extern void init_plugins(const char *);
+extern void init_plugins(void);
 extern void register_all_plugin_handoffs(void);
 extern void register_all_plugin_tap_listeners(void);
 
-/* get the global plugin dir */
-/* Return value is g_malloced so the caller should g_free() it. */
-extern char *get_plugins_global_dir(const char *plugin_dir);
-
 /* get the personal plugin dir */
 /* Return value is g_malloced so the caller should g_free() it. */
 extern char *get_plugins_pers_dir(void);