diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-10-24 07:08:26 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-10-24 07:08:26 +0000 |
| commit | f007c811a58aecac778c2fc3fb65f5a1e2bdb544 (patch) | |
| tree | b2bb4c308fc1bb70991458a136a98a11352085fa /gtk2 | |
| parent | e9986a84371216d04cac5a16b10086e52c3160b4 (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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6493 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk2')
| -rw-r--r-- | gtk2/Makefile.nmake | 5 | ||||
| -rw-r--r-- | gtk2/main.c | 12 |
2 files changed, 14 insertions, 3 deletions
diff --git a/gtk2/Makefile.nmake b/gtk2/Makefile.nmake index 3f17200cdf..88ff38da2d 100644 --- a/gtk2/Makefile.nmake +++ b/gtk2/Makefile.nmake @@ -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 diff --git a/gtk2/main.c b/gtk2/main.c index 6c9a2095ac..5ba3feabc4 100644 --- a/gtk2/main.c +++ b/gtk2/main.c @@ -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" |