Uh Oh: Fix to properly set SH_FLAGS with 'igncr' if required as part of the nmake;

I violated Murphy's nth law: thou shalt test fixes in an 
'out of the box' configuration *not* in one's customized configuration.
:(


svn path=/trunk/; revision=20221

Makefile.nmake

@@ -498,10 +498,6 @@ REQUIRED_TOOLS=\
 	wget
 
 verify_tools:
-#	This dos2unix hack shouldn't be necessary as of the SH_FLAGS mechanism in config.nmake.
-#	Unfortunately, SH_FLAGS doesn't work, so dos2unix was added here 
-#	(might be removed later if the SH_FLAGS mechanism is working).
-	dos2unix tools\win32-setup.sh
 	@$(SH) tools\win32-setup.sh --appverify $(REQUIRED_TOOLS)
 
 # Download and install all the required libraries into WIRESHARK_LIBS.

config.nmake

@@ -249,6 +249,9 @@ GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.14.5
 # Set the following mandatory commands to find the tools.
 # The easiest way is to use the corresponding packages from cygwin.
 
+# Set up the path to the cygwin binaries
+CYGWIN_PATH=c:\cygwin\bin
+
 # command for a shell (cygwin's bash package recommended)
 SH_PROG=bash
 
@@ -257,7 +260,7 @@ SH_PROG=bash
 # The following !IF results in the option being used only if it is available
 #  since using it on bash version 3.1.6 (or earlier) is not required and
 #  will cause an error message.
-!if "$(SH_PROG)"=="bash" && [bash -c "set -o igncr" 2>nul: ] == 0
+!if "$(SH_PROG)"=="bash" && [$(CYGWIN_PATH)\bash -c "set -o igncr" 2>nul: ] == 0
 SH_FLAGS=-o igncr
 !endif
 
@@ -342,9 +345,6 @@ LOCAL_LDFLAGS=/DEBUG
 # Set PDB_FILE according to your VC++ version 
 PDB_FILE=vc*.pdb
 
-# Set up the path to the cygwin binaries
-CYGWIN_PATH=c:\cygwin\bin
-
 # 
 # Optional: Use the User's Guide as the online help system
 # (currently experimental).