diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2007-09-24 06:59:40 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2007-09-24 06:59:40 +0000 |
| commit | 094e2a9a5f15ba8ade40546518c8e53daeb919a6 (patch) | |
| tree | cea80a11b50ede30c7d79ebc2c7b0acd63fc7285 /epan | |
| parent | f3c4a9def01172c2e3b5c2e65442abc0252da68a (diff) | |
Get rid of the remains of NET-SNMP in the build process.
svn path=/trunk/; revision=22934
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/Makefile.am | 2 | ||||
| -rw-r--r-- | epan/Makefile.nmake | 1 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.nmake | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-snmp.c | 14 |
4 files changed, 2 insertions, 17 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am index 0f02f23f5a..0ac1941da4 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -113,7 +113,7 @@ MAINTAINERCLEANFILES = \ # # Add the object files for missing routines, if any. # -libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm +libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SSL_LIBS@ -lm libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib) #EXTRA_PROGRAMS = reassemble_test diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 0103c38d8d..251c59e4ca 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -34,7 +34,6 @@ libwireshark_LIBS = \ $(NETTLE_LIBS) \ $(ZLIB_LIBS) \ $(GNUTLS_LIBS) \ - $(NET_SNMP_LIBS) \ $(LUA_LIBS) \ $(SMI_LIBS) \ ..\wiretap\wiretap-$(WTAP_VERSION).lib \ diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake index 80a662270c..05b3d2b612 100644 --- a/epan/dissectors/Makefile.nmake +++ b/epan/dissectors/Makefile.nmake @@ -10,7 +10,7 @@ include ..\..\config.nmake include Makefile.common CFLAGS=-WX -DHAVE_CONFIG_H /I. /I.. /I../.. $(GLIB_CFLAGS) \ - $(NET_SNMP_CFLAGS) $(ZLIB_CFLAGS) \ + $(ZLIB_CFLAGS) \ $(PCRE_CFLAGS) $(GNUTLS_CFLAGS) $(NETTLE_CFLAGS) \ $(KFW_CFLAGS) $(AIRPCAP_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index e0811d364d..402e54cb81 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -339,20 +339,6 @@ static const true_false_string auth_flags = { "Failed" }; -/* defined in net-SNMP; include/net-snmp/library/snmp.h */ -#undef SNMP_MSG_GET -#undef SNMP_MSG_SET -#undef SNMP_MSG_GETNEXT -#undef SNMP_MSG_RESPONSE -#undef SNMP_MSG_TRAP -#undef SNMP_MSG_GETBULK -#undef SNMP_MSG_INFORM -#undef SNMP_MSG_TRAP2 -#undef SNMP_MSG_REPORT -#undef SNMP_NOSUCHOBJECT -#undef SNMP_NOSUCHINSTANCE -#undef SNMP_ENDOFMIBVIEW - /* Security Models */ #define SNMP_SEC_ANY 0 |