diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-03-12 10:37:04 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-03-12 10:37:04 +0000 |
| commit | 6327b456db12bd383f402705881059d63e92e58d (patch) | |
| tree | 5958eee4b925d819c8dea3354f9338213aef04db /gtk | |
| parent | 385c80e202f7319f08a41fb3dd4cb2478d7b0c79 (diff) | |
| download | wireshark-6327b456db12bd383f402705881059d63e92e58d.tar.gz wireshark-6327b456db12bd383f402705881059d63e92e58d.tar.bz2 wireshark-6327b456db12bd383f402705881059d63e92e58d.zip | |
Get rid of the "--enable-snmp" option; instead, use "--with-ucdsnmp".
Make the directory option to "--with-ucdsnmp" optional. Handle
"--with-ucdsnmp" similar to the way "--with-pcap" is handled.
Get rid of unnecessary #defines in "packet-cops.c".
Get rid of no-longer-necessary include of "dlfcn.h" in "packet-snmp.c".
svn path=/trunk/; revision=4930
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/main.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gtk/main.c b/gtk/main.c index af085b3657..5814a32ee6 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c,v 1.242 2002/03/10 23:19:44 guy Exp $ + * $Id: main.c,v 1.243 2002/03/12 10:37:04 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -86,11 +86,9 @@ # include "snprintf.h" #endif -#if defined(HAVE_UCD_SNMP_SNMP_H) #ifdef HAVE_UCD_SNMP_VERSION_H #include <ucd-snmp/version.h> #endif /* HAVE_UCD_SNMP_VERSION_H */ -#endif /* SNMP */ #ifdef NEED_STRERROR_H #include "strerror.h" @@ -1397,7 +1395,7 @@ main(int argc, char *argv[]) #endif /* HAVE_LIBZ */ /* Oh, this is pretty */ -#if defined(HAVE_UCD_SNMP_SNMP_H) +#ifdef HAVE_UCD_SNMP g_string_append(comp_info_str, ", with UCD SNMP "); #ifdef HAVE_UCD_SNMP_VERSION_H g_string_append(comp_info_str, VersionInfo); @@ -1405,7 +1403,7 @@ main(int argc, char *argv[]) g_string_append(comp_info_str, "(version unknown)"); #endif /* HAVE_UCD_SNMP_VERSION_H */ #else /* no SNMP library */ - g_string_append(comp_info_str, ", without SNMP MIB support"); + g_string_append(comp_info_str, ", without UCD SNMP"); #endif /* Now get our args */ |