diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-10-24 07:08:26 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-10-24 07:08:26 +0000 |
| commit | ae1ebc09da31f6a69f96b0ee0a01505ef10ccbe0 (patch) | |
| tree | b2bb4c308fc1bb70991458a136a98a11352085fa /tethereal.c | |
| parent | d3c91154c5fa76ea978658fa7b644d4fea3a093d (diff) | |
Don't include the header file to get the SNMP version unless we're
building with an SNMP library.
If we have Net-SNMP, include <net-snmp/version.h>, not
<ucd-snmp/version.h>.
Don't include any of the SNMP headers unless HAVE_SOME_SNMP is defined.
Include <net-snmp/config_api.h> if we have Net-SNMP, to declare
"read_premib_configs()" and "read_configs()".
Supply the include directories for Net-SNMP in the Makefile.nmake for
GTK 1.2 and GTK 2.
svn path=/trunk/; revision=6493
Diffstat (limited to 'tethereal.c')
| -rw-r--r-- | tethereal.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/tethereal.c b/tethereal.c index 4a7a75eb54..8bc1f4cda4 100644 --- a/tethereal.c +++ b/tethereal.c @@ -1,6 +1,6 @@ /* tethereal.c * - * $Id: tethereal.c,v 1.163 2002/10/23 18:24:04 guy Exp $ + * $Id: tethereal.c,v 1.164 2002/10/24 07:08:22 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -60,9 +60,19 @@ # include "snprintf.h" #endif +#ifdef HAVE_SOME_SNMP +#ifdef HAVE_NET_SNMP +#include <net-snmp/version.h> +#else /* HAVE_NET_SNMP */ +/* + * XXX - we no longer support old versions of UCD SNMP; do all the + * versions we support have, and install, this header? + */ #ifdef HAVE_UCD_SNMP_VERSION_H #include <ucd-snmp/version.h> #endif /* HAVE_UCD_SNMP_VERSION_H */ +#endif /* HAVE_NET_SNMP */ +#endif /* HAVE_SOME_SNMP */ #ifdef NEED_STRERROR_H #include "strerror.h" |