diff options
| -rw-r--r-- | Makefile.nmake | 20 | ||||
| -rw-r--r-- | config.h.win32 | 4 | ||||
| -rw-r--r-- | config.nmake | 27 |
3 files changed, 35 insertions, 16 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index c12249a15a..7ace9e37b1 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -106,6 +106,7 @@ dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ $(ADNS_LIBS) \ $(PCRE_LIBS) \ $(ZLIB_LIBS) \ + $(SMI_LIBS) \ $(GNUTLS_LIBS) !ENDIF @@ -304,6 +305,7 @@ config.h : config.h.win32 config.nmake -e "s/@HAVE_LIBPORTAUDIO@/$(PORTAUDIO_CONFIG)/" \ -e "s/@PORTAUDIO_API_1@/$(PORTAUDIO_API_CONFIG)/" \ -e "s/@HAVE_NET_SNMP@/$(NET_SNMP_CONFIG)/" \ + -e "s/@HAVE_SMI@/$(SMI_CONFIG)/" \ < config.h.win32 > $@ ps.c : rdps.exe print.ps @@ -658,10 +660,7 @@ setup: verify_tools clean_setup @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ . lua5_1_dll.zip !ENDIF -!IFDEF LIBSMI_DIR - @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ - . libsmi-0.4.5.zip -!ENDIF + !IFDEF GNUTLS_DIR @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ . gnutls-1.6.1-1.zip @@ -670,6 +669,10 @@ setup: verify_tools clean_setup @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ . portaudio_v19.zip !ENDIF +!IFDEF SMI_DIR + @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ + . libsmi-0.4.5.zip +!ENDIF !IFDEF GTK2_DIR !IF "$(GTK2_INST_VERSION)" == "2.10" @@ -788,6 +791,7 @@ clean_setup: rm -r -f $(WIRESHARK_LIBS)/kfw-2.5 rm -r -f $(WIRESHARK_LIBS)/libiconv-1.9.1.bin.woe32 rm -r -f $(WIRESHARK_LIBS)/lua5.1 + rm -r -f $(WIRESHARK_LIBS)/libsmi-0.4.5 rm -r -f $(WIRESHARK_LIBS)/net-snmp-5.4 rm -r -f $(WIRESHARK_LIBS)/pcre-6.4 rm -r -f $(WIRESHARK_LIBS)/portaudio_v18_1 @@ -1015,7 +1019,7 @@ install-common-deps: xcopy $(GNUTLS_DIR)\bin\libgpg-error-0.dll $(INSTALL_DIR) /d xcopy $(GNUTLS_DIR)\bin\libtasn1-3.dll $(INSTALL_DIR) /d !ENDIF -!IFDEF NET_SNMP_DIR +!IFDEF NET_SNMP_DIR_DISABLED_BEFORE_DELETION if not exist $(INSTALL_DIR)\snmp mkdir $(INSTALL_DIR)\snmp if not exist $(INSTALL_DIR)\snmp\mibs mkdir $(INSTALL_DIR)\snmp\mibs xcopy "$(NET_SNMP_DIR)\mibs\*.txt" $(INSTALL_DIR)\snmp\mibs /d @@ -1023,6 +1027,12 @@ install-common-deps: !IFDEF LUA_DIR xcopy "$(LUA_DIR)\lib\dll\lua5.1.dll" $(INSTALL_DIR) /d !ENDIF +!IFDEF SMI_DIR + if not exist $(INSTALL_DIR)\snmp mkdir $(INSTALL_DIR)\snmp + if not exist $(INSTALL_DIR)\snmp\mibs mkdir $(INSTALL_DIR)\snmp\mibs + xcopy "$(SMI_DIR)\lib\smi.dll" $(INSTALL_DIR) /d + xcopy "$(SMI_DIR)\mibs\*" $(INSTALL_DIR)\snmp\mibs /d +!ENDIF clean-deps1: rm -rf $(INSTALL1_DIR) diff --git a/config.h.win32 b/config.h.win32 index a49d6ec792..520cfd2e7f 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -222,6 +222,10 @@ /* Define version of of the Portaudio library API */ @PORTAUDIO_API_1@ +/* Define to have SMI */ +@HAVE_SMI@ + + #ifndef WIN32 #define WIN32 1 #endif diff --git a/config.nmake b/config.nmake index 99e2fba4a5..6c9890b302 100644 --- a/config.nmake +++ b/config.nmake @@ -236,17 +236,6 @@ KFW_DIR=$(WIRESHARK_LIBS)\kfw-2.5 # NETTLE_DIR=$(WIRESHARK_LIBS)\nettle-1.10 # -# Optional: libsmi library enables OID and MIB resolution. -# -# If you have the libsmi library, set this to the directory in which -# the libsmi package is stored. -# -# If you don't have libsmi, comment this line out, so that LIBSMI_DIR -# isn't defined. -# -LIBSMI_DIR=$(WIRESHARK_LIBS)\libsmi-0.4.5 - -# # Optional: the LUA library enables scripting support. # # If you have the LUA library, set this to the directory in which @@ -304,6 +293,12 @@ GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.14.5 # AIRPCAP_DIR=$(WIRESHARK_LIBS)\AirPcap_Devpack_1_0_0_594\AirPcap_Devpack +# +# Optional: LIBSMI, System Management Interface +# +# Used for oid-name resolution for SNMP and other protocols +# +SMI_DIR=$(WIRESHARK_LIBS)\libsmi-0.4.5 ##### Tools ##### @@ -794,6 +789,16 @@ HHC_CFLAGS= HHC_LIBS= !ENDIF +!IFDEF SMI_DIR +SMI_CONFIG=^#define HAVE_LIBSMI 1 +SMI_CFLAGS=/I$(SMI_DIR)\include +SMI_LIBS=$(SMI_DIR)\lib\smi.lib +!ELSE +SMI_LIBS= +SMI_CFLAGS= +SMI_CONFIG= +!ENDIF + !IFDEF ENABLE_LIBWIRESHARK LIBWIRESHARK_CONFIG=^#define HAVE_LIBWIRESHARKDLL 1 # Link plugins with the import library of libwireshark.dll |