osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Guy Harris 2002-10-24 07:08:26 +00:00
parent d3c91154c5
commit ae1ebc09da
6 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/Makefile.nmake
View File

@ -1,7 +1,7 @@
## Makefile for building ethereal.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
# $Id: Makefile.nmake,v 1.31 2002/09/23 17:07:39 jmayer Exp $
# $Id: Makefile.nmake,v 1.32 2002/10/24 07:08:24 guy Exp $
include ..\config.nmake
@ -13,7 +13,8 @@ CFLAGS=-DHAVE_CONFIG_H /I.. /I../wiretap \
/I$(ZLIB_DIR) \
/I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \
/I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
/I$(PCAP_DIR)\include /I$(NET_SNMP_DIR)\include \
/I$(NET_SNMP_DIR)\win32 -D_U_="" $(LOCAL_CFLAGS)
CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL

12
gtk/main.c
View File

@ -1,6 +1,6 @@
/* main.c
*
* $Id: main.c,v 1.267 2002/10/23 18:24:07 guy Exp $
* $Id: main.c,v 1.268 2002/10/24 07:08:24 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"

5
gtk2/Makefile.nmake
View File

@ -1,7 +1,7 @@
## Makefile for building ethereal.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
# $Id: Makefile.nmake,v 1.7 2002/09/23 15:00:39 jmayer Exp $
# $Id: Makefile.nmake,v 1.8 2002/10/24 07:08:26 guy Exp $
include ..\config.nmake
@ -13,7 +13,8 @@ CFLAGS=-DHAVE_CONFIG_H /I.. /I../wiretap \
/I$(ZLIB_DIR) \
/I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \
/I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
/I$(PCAP_DIR)\include /I$(NET_SNMP_DIR)\include \
/I$(NET_SNMP_DIR)\win32 -D_U_="" $(LOCAL_CFLAGS)
CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL

12
gtk2/main.c
View File

@ -1,6 +1,6 @@
/* main.c
*
* $Id: main.c,v 1.15 2002/10/23 18:24:09 guy Exp $
* $Id: main.c,v 1.16 2002/10/24 07:08:26 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"

11
packet-snmp.c
View File

@ -10,7 +10,7 @@
*
* See RFCs 2570-2576 for SNMPv3
*
* $Id: packet-snmp.c,v 1.99 2002/10/24 06:39:09 tpot Exp $
* $Id: packet-snmp.c,v 1.100 2002/10/24 07:08:22 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -53,11 +53,13 @@
#include "etypes.h"
#include "packet-ipx.h"
#ifdef HAVE_SOME_SNMP
#ifdef HAVE_NET_SNMP
# include <net-snmp/net-snmp-config.h>
# include <net-snmp/mib_api.h>
# include <net-snmp/library/default_store.h>
#elif defined(HAVE_UCD_SNMP)
# include <net-snmp/config_api.h>
#else /* HAVE_NET_SNMP */
# include <ucd-snmp/ucd-snmp-config.h>
# include <ucd-snmp/asn1.h>
# include <ucd-snmp/snmp_api.h>
@ -71,9 +73,8 @@
# define NETSNMP_DS_LIBRARY_ID DS_LIBRARY_ID
# define NETSNMP_DS_LIB_NO_TOKEN_WARNINGS DS_LIB_NO_TOKEN_WARNINGS
# define NETSNMP_DS_LIB_PRINT_SUFFIX_ONLY DS_LIB_PRINT_SUFFIX_ONLY
#endif
#endif /* HAVE_NET_SNMP */
#ifdef HAVE_SOME_SNMP
/*
* Define values "sprint_realloc_value()" expects.
*/
@ -89,7 +90,7 @@
# define VALTYPE_BITSTR ASN_BIT_STR
# define VALTYPE_COUNTER64 ASN_COUNTER64
#endif
#endif /* HAVE_SOME_SNMP */
#include "asn1.h"

12
tethereal.c
View File

@ -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"