Get rid of the remains of NET-SNMP in the build process.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22934 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.am b/Makefile.am
index f6d80ba2fb8d2860292988350fea4e65dbaaf0dd..5c28e9523114e0aa2542695b9b7fc4a3b30a3d2f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -285,7 +285,7 @@ wireshark_LDADD = \
        wiretap/libwiretap.la           \
        epan/libwireshark.la            \
        @INET_PTON_LO@                  \
-       @SNMP_LIBS@ @SSL_LIBS@          \
+       @SSL_LIBS@                      \
        $(plugin_ldadd)                 \
        @PCRE_LIBS@                     \
        @PCAP_LIBS@ @GTK_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ @FRAMEWORKS@ \
@@ -306,7 +306,7 @@ tshark_LDADD = \
        wiretap/libwiretap.la           \
        epan/libwireshark.la            \
        @INET_PTON_LO@                  \
-       @SNMP_LIBS@ @SSL_LIBS@          \
+       @SSL_LIBS@                      \
        $(plugin_ldadd)                 \
        @PCRE_LIBS@                     \
        @GLIB_LIBS@ -lm                 \
@@ -350,7 +350,7 @@ dftest_LDADD = \
        $(wireshark_optional_objects)   \
        wiretap/libwiretap.la           \
        epan/libwireshark.la            \
-       @SNMP_LIBS@ @SSL_LIBS@          \
+       @SSL_LIBS@                      \
        $(plugin_ldadd)                 \
        @PCRE_LIBS@                     \
        @GLIB_LIBS@ -lm                 \

diff --git a/Makefile.nmake b/Makefile.nmake
index 8fd729cabd9b9fceea4b36d56b28451840af33d7..2c58cd3dbe532eca02026fb9d3d8c3368306e4f1 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -15,7 +15,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 CFLAGS=-WX -DHAVE_CONFIG_H $(LOCAL_CFLAGS) $(GLIB_CFLAGS) /I. /Iwiretap \
        $(ZLIB_CFLAGS) /I$(PCAP_DIR)\include \
-       $(NET_SNMP_CFLAGS) $(AIRPCAP_CFLAGS) \
+       $(AIRPCAP_CFLAGS) \
        $(ADNS_CFLAGS) $(PCRE_CFLAGS) $(GNUTLS_CFLAGS) $(LUA_CFLAGS) $(SMI_CFLAGS) \
        -D_U_="" -D_NEED_VAR_IMPORT_
 
@@ -43,7 +43,6 @@ EXTRA_OBJECTS = \
 
 wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
        wsock32.lib user32.lib shell32.lib comctl32.lib \
-       $(NET_SNMP_LIBS) \
        $(HHC_LIBS) \
 !IFDEF ENABLE_LIBWIRESHARK
        epan\libwireshark.lib \
@@ -62,7 +61,6 @@ wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
 tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
        wsock32.lib user32.lib \
        $(GLIB_LIBS) \
-       $(NET_SNMP_LIBS) \
 !IFDEF ENABLE_LIBWIRESHARK
        epan\libwireshark.lib \
 !ELSE
@@ -96,7 +94,6 @@ dumpcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
 dftest_LIBS=  wiretap\wiretap-$(WTAP_VERSION).lib \
        wsock32.lib user32.lib \
        $(GLIB_LIBS) \
-       $(NET_SNMP_LIBS) \
 !IFDEF ENABLE_LIBWIRESHARK
        epan\libwireshark.lib \
 !ELSE
@@ -112,8 +109,7 @@ dftest_LIBS=  wiretap\wiretap-$(WTAP_VERSION).lib \
 
 randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
        user32.lib \
-       $(GLIB_LIBS) \
-       $(NET_SNMP_LIBS)
+       $(GLIB_LIBS)
 
 EXECUTABLES=wireshark.exe wireshark-gtk2.exe tshark.exe \
        capinfos.exe editcap.exe mergecap.exe text2pcap.exe randpkt.exe dumpcap.exe
@@ -306,8 +302,7 @@ config.h    : config.h.win32 config.nmake
            -e "s/@HAVE_AIRPDCAP@/$(AIRPDCAP_CONFIG)/" \
            -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)/" \
+           -e "s/@HAVE_SMI@/$(SMI_CONFIG)/" \
            < config.h.win32 > $@
 
 ps.c   : rdps.exe print.ps
@@ -646,10 +641,6 @@ process_libs:
                libiconv-1.9.1.bin.woe32 libiconv-1.9.1.bin.woe32.zip
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
                gettext-0.14.5 gettext-0.14.5.zip
-!IFDEF NET_SNMP_DIR
-       @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               . net-snmp-5.4.zip
-!ENDIF
 !IFDEF KFW_DIR
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
                kfw-2.5 kfw-2.5.zip
@@ -812,7 +803,6 @@ clean_setup:
     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
     rm -r -f $(WIRESHARK_LIBS)/portaudio_v19
@@ -1040,11 +1030,6 @@ 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_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
-!ENDIF
 !IFDEF LUA_DIR
        xcopy "$(LUA_DIR)\lib\dll\lua5.1.dll" $(INSTALL_DIR) /d
 !ENDIF

diff --git a/acinclude.m4 b/acinclude.m4
index 9a5333f94c0c912178e2fd3b11951c9625b0fbd8..ba7c65e305cb96a80162116476727a0e86df176c 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1169,82 +1169,6 @@ AC_DEFUN([AC_WIRESHARK_LIBPORTAUDIO_CHECK],[
        fi
 ])
 
-#
-# AC_WIRESHARK_NETSNMP_CHECK
-#
-AC_DEFUN([AC_WIRESHARK_NETSNMP_CHECK],
-[
-       dnl get the net-snmp-config binary
-       if test "x$netsnmpconfig" = "x" ; then
-               #
-               # The user didn't specify where net-snmp-config is
-               # located; search for it.
-               #
-               AC_PATH_PROG(NETSNMPCONFIG, net-snmp-config)
-       else
-               NETSNMPCONFIG=$netsnmpconfig
-               if test ! -x $NETSNMPCONFIG -o ! -f $NETSNMPCONFIG ; then
-                       NETSNMPCONFIG=$netsnmpconfig/bin/net-snmp-config
-                       if test ! -x $NETSNMPCONFIG -o ! -f $NETSNMPCONFIG ; then
-                               AC_MSG_ERROR(Invalid net-snmp-config: $netsnmpconfig)
-                       fi
-               fi
-       fi
-
-       #
-       # XXX - check whether $NETSNMPCONFIG is executable?
-       # if test "x$NETSNMPCONFIG" != "xno" -a "x$NETSNMPCONFIG" != "x" -a -x "$NETSNMPCONFIG" ; then
-       # We already did that if it was set; presumably AC_PATH_PROG
-       # will fail if it doesn't find an executable version.
-       #
-       if test "x$NETSNMPCONFIG" != "x" ; then
-               dnl other choices for flags to use here: could also use
-               dnl --prefix or --exec-prefix if you don't want the full list.
-
-               #
-               # Save the current settings of CFLAGS and CPPFLAGS, and add
-               # the output of "$NETSNMPCONFIG --cflags" to it, so that when
-               # searching for the Net-SNMP headers, we look in whatever
-               # directory that output specifies.
-               #
-               wireshark_save_CFLAGS="$CFLAGS"
-               wireshark_save_CPPFLAGS="$CPPFLAGS"
-               CFLAGS="$CFLAGS `$NETSNMPCONFIG --cflags`"
-               CPPFLAGS="$CPPFLAGS `$NETSNMPCONFIG --cflags`"
-
-               AC_CHECK_HEADERS(net-snmp/net-snmp-config.h net-snmp/library/default_store.h)
-               if test "x$ac_cv_header_net_snmp_net_snmp_config_h" = "xyes" -a "x$ac_cv_header_net_snmp_library_default_store_h" = "xyes" ; then
-                       SNMP_LIBS=`$NETSNMPCONFIG --libs`
-                       if echo "$SNMP_LIBS" | grep crypto >/dev/null  && test "x$SSL_LIBS" = "x"; then
-                               if test "x$want_netsnmp" = "xyes" ; then
-                                       AC_MSG_ERROR(Net-SNMP requires openssl but ssl not enabled)
-                               else
-                                       AC_MSG_RESULT(Net-SNMP requires openssl but ssl not enabled - disabling Net-SNMP)
-                               fi
-                               CFLAGS="$wireshark_save_CFLAGS"
-                               CPPFLAGS="$wireshark_save_CPPFLAGS"
-                               SNMP_LIBS=
-                       else
-                               AC_DEFINE(HAVE_NET_SNMP, 1, [Define to enable support for Net-SNMP])
-                               have_net_snmp="yes"
-                       fi
-               else
-                       if test "x$want_netsnmp" = "xyes" ; then
-                               AC_MSG_ERROR(Net-SNMP not found)
-                       else
-                               #
-                               # Restore the versions of CFLAGS and
-                               # CPPFLAGS before we added the output
-                               # of '$NETSNMPCONFIG --cflags", as we
-                               # didn't actually find Net-SNMP there.
-                               #
-                               CFLAGS="$wireshark_save_CFLAGS"
-                               CPPFLAGS="$wireshark_save_CPPFLAGS"
-                       fi
-               fi
-       fi      
-])
-
 #
 # AC_WIRESHARK_RPM_CHECK
 # Looks for the rpm program, and checks to see if we can redefine "_topdir".

diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c
index e07101a7ee2033738afcc497e28ef79698e7ee65..64eeb340c5a6e52fc1badc6337d6417e53118f97 100644 (file)
--- a/asn1/snmp/packet-snmp-template.c
+++ b/asn1/snmp/packet-snmp-template.c
@@ -237,20 +237,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

diff --git a/config.nmake b/config.nmake
index 8501797dd0091383e50bf2002b658fe27fbad607..d334c1b6b670157ce916d9d39006a64f4f311239 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -159,18 +159,6 @@ PCAP_DIR=$(WIRESHARK_LIBS)\WPdpack
 #
 ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123
 
-#
-# Optional: The Net-SNMP library enables SNMP OID to name resolvings
-# for the MIBs available.
-#
-# If you have Net-SNMP, set this to the pathname of the directory in
-# which the Net-SNMP headers and .lib file are stored.
-#
-# If you don't have Net-SNMP, comment this line out, so that NET_SNMP_DIR
-# isn't defined.
-#
-#NET_SNMP_DIR=$(WIRESHARK_LIBS)\net-snmp-5.4
-
 #
 # Optional: the ADNS library enables asynchronous (nonblocking) DNS 
 # name resolvings.
@@ -666,17 +654,6 @@ ZLIB_LIBS=
 ZLIB_CONFIG=
 !ENDIF
 
-!IFDEF NET_SNMP_DIR
-NET_SNMP_CFLAGS=/I$(NET_SNMP_DIR)\include /I$(NET_SNMP_DIR)\win32
-NET_SNMP_LIBS=$(NET_SNMP_DIR)\win32\lib\release\netsnmp.lib
-# Nmake uses carets to escape special characters
-NET_SNMP_CONFIG=^#define HAVE_NET_SNMP 1
-!else
-NET_SNMP_CFLAGS=
-NET_SNMP_LIBS=
-NET_SNMP_CONFIG=
-!ENDIF
-
 !IFDEF ADNS_DIR
 ADNS_PATH=$(ADNS_DIR)\adns_win32\lib
 ADNS_CFLAGS=/I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32

diff --git a/configure.in b/configure.in
index c0760158a4c984ba481326434d92910bce242567..af317b5d0127159f84b9d7500605cbcc1acdc65c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1104,53 +1104,6 @@ else
 fi
 AC_SUBST(SSL_LIBS)
 
-dnl Net-SNMP Check
-SNMP_LIBS=''
-
-AC_ARG_WITH(net-snmp,
-  AC_HELP_STRING( [--with-net-snmp@<:@=PATH@:>@],
-                  [use Net-SNMP library (with PATH as the location of the net-snmp-config shell script that comes with the net-snmp package, if supplied)  @<:@default=yes, if available@:>@]),
-[
-       if test $withval = no
-       then
-               want_netsnmp=no
-       elif test $withval = yes
-       then
-               want_netsnmp=yes
-       else
-               want_netsnmp=yes
-               netsnmpconfig="$withval"
-       fi
-],[
-       #
-       # Set "want_netsnmp" to "ifavailable" to make the default "use it
-       # if you find it, otherwise don't".
-       #
-       want_netsnmp=ifavailable
-])
-
-#
-# Try Net-SNMP
-#
-AC_MSG_CHECKING(whether to use Net-SNMP library)
-if test "x$want_netsnmp" = "xno" ; then
-       AC_MSG_RESULT(no)
-else
-       if test "x$want_netsnmp" = "xifavailable" ; then
-               AC_MSG_RESULT([yes, if available])
-       else
-               AC_MSG_RESULT(yes)
-       fi
-       AC_WIRESHARK_NETSNMP_CHECK
-fi
-
-if test "x$have_net_snmp" = "xyes"; then
-       AC_DEFINE(HAVE_NET_SNMP, 1, [Define to 1 if Net-SNMP support is to be used])
-fi
-
-AC_SUBST(SNMP_LIBS)
-
-
 dnl kerberos check
 AC_MSG_CHECKING(whether to use kerberos)
 
@@ -1616,12 +1569,6 @@ else
        adns_message="no"
 fi
 
-if test "x$have_net_snmp" = "xyes" ; then
-       snmp_libs_message="yes"
-else
-       snmp_libs_message="no"
-fi
-
 echo ""
 echo "The Wireshark package has been configured with the following options."
 echo "                    Build wireshark : $enable_wireshark"
@@ -1653,5 +1600,4 @@ echo "               Use SMI SNMP library : $libsmi"
 echo "             Use GNU crypto library : $gcrypt_message"
 echo "             Use SSL crypto library : $ssl_message"
 echo "           Use IPv6 name resolution : $enable_ipv6"
-echo "               Use Net-SNMP library : $snmp_libs_message"
 echo "                 Use gnutls library : $tls_message"

diff --git a/epan/Makefile.am b/epan/Makefile.am
index 0f02f23f5af8e3fddadd9e6e4fcb1dce789e2e2a..0ac1941da454b95f666284ae85657f5954ecc0f9 100644 (file)
--- 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 0103c38d8d1ba015fc58c34c352d9343e2605175..251c59e4ca43b71965de3431915554644d5d254e 100644 (file)
--- 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 80a662270c13c307f0727daa26da936fa9eb25b5..05b3d2b61286da84958e08f736d234c95d89b6ab 100644 (file)
--- 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 e0811d364db20d6ddb23f0ddd180ca2680ea5789..402e54cb81df6bc4a1c8589c9698fd11a9781516 100644 (file)
--- 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

diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake
index 96c18a365ba84153cbf2553b7eb3b8e492d92da9..0212d53e147426db52e5748801a085a806c50b78 100644 (file)
--- a/gtk/Makefile.nmake
+++ b/gtk/Makefile.nmake
@@ -10,7 +10,7 @@ include ..\config.nmake
 CFLAGS=-WX -DHAVE_CONFIG_H /I.. /I../wiretap $(GTK_CFLAGS) $(GNUTLS_CFLAGS) \
        /I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \
        /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \
-       /I$(PCAP_DIR)\include $(NET_SNMP_CFLAGS) $(AIRPCAP_CFLAGS) \
+       /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \
        /Zm800 -D_U_="" -D_NEED_VAR_IMPORT_ $(LOCAL_CFLAGS) \
        $(PORTAUDIO_CFLAGS) \
        $(HHC_CFLAGS)

diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index e25c6ee7123b81a00804936751d14dd9545d6f51..84bfc565d0dbe9bf2f19fa1d3a994884e988b049 100644 (file)
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -147,9 +147,6 @@ $(DEST)-setup-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile.nm
        /DGETTEXT_DIR=$(GETTEXT_DIR) \
        /DVERSION=$(VERSION) \
        /DWTAP_VERSION=$(WTAP_VERSION) \
-!IF "$(NET_SNMP_DIR)" != ""
-       /DNET_SNMP_DIR=$(NET_SNMP_DIR) \
-!ENDIF
 !IF "$(ADNS_DIR)" != ""
        /DADNS_DIR=$(ADNS_DIR) \
 !ENDIF