Index: nmake.opt
===================================================================
--- nmake.opt	(revision 21458)
+++ nmake.opt	(working copy)
@@ -51,7 +51,7 @@
 MRSID_CONFIG =     Release_md
 !ENDIF
 !IFNDEF MRSID_JP2
-MRSID_JP2 =        NO
+#MRSID_JP2 =        NO
 !ENDIF
 
 ###############################################################################
@@ -163,7 +163,7 @@
 MRSID_AUTORVER =   800
 !ELSE IF [find "NITFTRELocation" $(R701) > NUL 2>&1] == 0
 MRSID_AUTORVER =   701
-!ELSE IF EXIST("$(R700)")
+!ELSE IF EXIST($(R700))
 MRSID_AUTORVER =   700
 !ELSE IF [find "ltic_getDimsAtMag" $(R607) > NUL 2>&1] == 0
 MRSID_AUTORVER =   607
@@ -438,8 +438,10 @@
 !ERROR Cannot link dynamically against the MrSID Raster ESDK.  Try linking statically by setting MRSID_RDLLBUILD to NO.
 !ELSE IF EXIST("$(MRSID_RASTER_DIR)\lib\lti_dsdk.dll")
 MRSID_LIB =        "$(MRSID_RASTER_DIR)\lib\lti_dsdk.lib" $(MRSID_LIB)
+MRSID_DLL =        "$(MRSID_RASTER_DIR)\lib\lti_dsdk.dll"
 !ELSE IF EXIST("$(MRSID_RASTER_DIR)\lib\$(MRSID_CONFIG)\lti_dsdk_dll.dll")
 MRSID_LIB =        "$(MRSID_RASTER_DIR)\lib\$(MRSID_CONFIG)\lti_dsdk_dll.lib" $(MRSID_LIB)
+MRSID_DLL =        "$(MRSID_RASTER_DIR)\lib\$(MRSID_CONFIG)\lti_dsdk_dll.dll"
 !ELSE IF EXIST("$(MRSID_RASTER_DIR)\lib\Release_md\lti_dsdk_dll.dll")
 # sdks 5 and older shipped only one configuration of the dll
 !ERROR Found a MrSID Raster DLL under $(MRSID_RASTER_DIR)\lib\Release_md, but specified config was $(MRSID_CONFIG).  Try setting MRSID_CONFIG to Release_md.
@@ -462,8 +464,9 @@
 # v8+ dsdk can only be linked dynamically
 !ERROR Cannot link statically against this version of the MrSID Raster DSDK ($(MRSID_RVER)).  Try linking dynamically by setting MRSID_RDLLBUILD to YES.
 !ENDIF
-!ELSE IF EXIST("$(MRSID_RASTER_DIR)\lib\$(MRSID_CONFIG)\lti_dsdk.lib")
+!ELSE IF EXIST("$(MRSID_RASTER_DIR)\lib\$(MRSID_CONFIG)\lti_dsdk.dll")
 MRSID_LIB =        "$(MRSID_RASTER_DIR)\lib\$(MRSID_CONFIG)\lti_dsdk.lib" $(MRSID_LIB)
+MRSID_DLL =        "$(MRSID_RASTER_DIR)\lib\$(MRSID_CONFIG)\lti_dsdk.dll"
 !ELSE IF EXIST("$(MRSID_RASTER_DIR)\lib\$(MRSID_CONFIG)\lti_sdk.lib")
 # very old sdk indeed
 MRSID_LIB =        "$(MRSID_RASTER_DIR)\lib\$(MRSID_CONFIG)\lti_sdk.lib" $(MRSID_LIB)
@@ -517,6 +520,7 @@
 # Find and validate the specific DLL and add it to MRSID_LIB
 !IF EXIST("$(MRSID_LIDAR_DIR)\lib\lti_lidar_dsdk.dll")
 MRSID_LIB =        "$(MRSID_LIDAR_DIR)\lib\lti_lidar_dsdk.lib" $(MRSID_LIB)
+LIDAR_DLL =        "$(MRSID_LIDAR_DIR)\lib\lti_lidar_dsdk.dll"
 !ELSE IF $(MRSID_LVER)0 < 1110
 !ERROR Cannot link dynamically against this version of the MrSID Lidar SDK ($(MRSID_LVER)).  Try linking statically by setting MRSID_LDLLBUILD to NO.
 !ELSE
@@ -558,5 +562,7 @@
 !MESSAGE MRSID_FLAGS      = $(MRSID_FLAGS)
 !MESSAGE MRSID_INCLUDE    = $(MRSID_INCLUDE)
 !MESSAGE MRSID_LIB        = $(MRSID_LIB)
+!MESSAGE MRSID_DLL        = $(MRSID_DLL)
+!MESSAGE LIDAR_DLL        = $(LIDAR_DLL)
 !ENDIF