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 /acconfig.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 'acconfig.h')
| -rw-r--r-- | acconfig.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/acconfig.h b/acconfig.h index d33adb88c3..cf05fef1ec 100644 --- a/acconfig.h +++ b/acconfig.h @@ -1,7 +1,7 @@ /* acconfig.h * #ifdefs to be controlled by "configure" * - * $Id: acconfig.h,v 1.16 2000/07/14 07:11:52 guy Exp $ + * $Id: acconfig.h,v 1.17 2000/10/16 23:18:03 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -31,10 +31,6 @@ #undef DATAFILE_DIR -#undef NEED_INET_ATON_H - -#undef NEED_INET_V6DEFS_H - #undef NEED_SNPRINTF_H #undef NEED_STRERROR_H |