diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-10-16 23:18:05 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-10-16 23:18:05 +0000 |
| commit | cba377df3c5bb5c4920eac87041d4a52246babd7 (patch) | |
| tree | 29f50f9b0aa9fdf3db85139eb7a63357c9a4c298 /epan/plugins.h | |
| parent | cb0a63c8e77464c022e40dc1b25c5aeb2a4c1ba6 (diff) | |
| download | wireshark-cba377df3c5bb5c4920eac87041d4a52246babd7.tar.gz wireshark-cba377df3c5bb5c4920eac87041d4a52246babd7.tar.bz2 wireshark-cba377df3c5bb5c4920eac87041d4a52246babd7.zip | |
Give libethereal its own configuration file, and have that configuration
file, rather than the top-level Ethereal configuration file, check for
"inet_aton()", "inet_pton()", and "inet_ntop()". Then make its
Makefile.am include the appropriate object files if necessary.
Otherwise, they don't get built and put into libethereal, and therefore
attempts to link with anything in libethereal that uses them fail on
platforms that lack ethem, causing the build to fail.
That means a bunch of things need to be fixed to cope with libethereal
having its own "config.h" file; this means removing the include of
"config.h" from some libethereal header files. Move the definitions of
the path names used only by "resolv.c" to "resolv.c" from "resolv.h" (so
"resolv.h" doesn't need "config.h", define HAVE_PLUGINS in the configure
script (so we don't have to include it in "plugins.h" to check whether
HAVE_DLFCN_H is defined).
Unfortunately, stuff outside libethereal needs to know PLUGIN_DIR; for
now, define that in the top-level configuration file, and have Ethereal
and Tethereal pass it as an argument to "epan_init()" - that should be
cleaned up at some point.
Remove from the top-level configure script checks for things used only
in libethereal.
svn path=/trunk/; revision=2498
Diffstat (limited to 'epan/plugins.h')
| -rw-r--r-- | epan/plugins.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/epan/plugins.h b/epan/plugins.h index f66674aaeb..9cdec6e313 100644 --- a/epan/plugins.h +++ b/epan/plugins.h @@ -1,7 +1,7 @@ /* plugins.h * definitions for plugins structures * - * $Id: plugins.h,v 1.1 2000/09/27 04:54:51 gram Exp $ + * $Id: plugins.h,v 1.2 2000/10/16 23:17:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -29,20 +29,9 @@ #include <glib.h> #include <gmodule.h> -#ifdef HAVE_CONFIG_H -#include "config.h" -#ifdef HAVE_DLFCN_H -#define HAVE_PLUGINS 1 -#endif -#endif /* HAVE_CONFIG_H */ - #include "dfilter.h" #include "packet.h" -#ifdef HAVE_WINSOCK_H -#include <winsock.h> -#endif - typedef struct _plugin { GModule *handle; /* handle returned by dlopen */ gchar *name; /* plugin name */ @@ -68,7 +57,7 @@ void *disable_plugin(const gchar *, const gchar *); void *find_plugin(const gchar *, const gchar *); gboolean is_enabled(const gchar *, const gchar *); void plugin_replace_filter(const gchar *, const gchar *, const gchar *, dfilter *); -int save_plugin_status(); -void init_plugins(); +int save_plugin_status(void); +void init_plugins(const char *); #endif /* __PLUGINS_H__ */ |