[svn] Windows update from Herold Heiko.

diff --git a/INSTALL b/INSTALL
index 331139e3da7b152e2646e8c9ca0c182bbacdc87e..894fab3e2672b54bbe2afaf7f71bd1612dc0b0d2 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -53,10 +53,9 @@ you need to specify your alternate OpenSSL root directory.  For
 instance, if libcrypto.* and libssl.* are in /opt/openssl/lib, you
 need to `configure --with-ssl=/opt/openssl'.
 
-To configure Wget on Windows, run configure.bat and follow the
-instructions in the windows/ directory.  If this doesn't work for any
-reason, talk to the Windows developers listed in `windows/README'; I
-do not maintain the port.
+To configure Wget on Windows, read the instructions in `windows/Readme'. 
+If this doesn't work for any reason, talk to the Windows developers 
+listed there; I do not maintain the port.
 
 2) Compilation
 

diff --git a/windows/Makefile.src b/windows/Makefile.src
index ab7cd5b5bc6add182802747c6a706edea3c021bf..c6d5f9c96dc301c64593a234b6eff42063249202 100644 (file)
--- a/windows/Makefile.src
+++ b/windows/Makefile.src
@@ -19,11 +19,12 @@
 # Version: 1.4.4
 #
 
-#Uncomment these if you have openssl available
-#SSLDEFS       =       /DHAVE_SSL
-#SSLLIBS       =       libeay32.lib ssleay32.lib
-#SSLSRC        =       gen_sslfunc.c
-#SSLOBJ        =       gen_sslfunc$o
+#Comment these if you don't have openssl available - however https
+#won't work.
+SSLDEFS        =       /DHAVE_SSL
+SSLLIBS        =       libeay32.lib ssleay32.lib
+SSLSRC =       gen_sslfunc.c
+SSLOBJ =       gen_sslfunc$o
 
 SHELL = command
 

diff --git a/windows/README b/windows/README
index 41b06a4c131d7f74b42042ff88796527a4ea4dc1..990005ce8436be6e67d786d2d1eac8bcb930761a 100644 (file)
--- a/windows/README
+++ b/windows/README
@@ -1,8 +1,24 @@
                                                            -*- text -*-
 
-To build Wget with VC++ run configure.bat in the wget directory, and
-then run nmake. At a certain point in time wget exposed some compiler
-bugs in VC++ 5.0; VC++ 6.0 sp 5 is known to be safe.
+To build Wget with VC++ run configure.bat (in the main wget directory), 
+and then run nmake. At a certain point in time wget exposed some 
+compiler bugs in VC++ 5.0; VC++ 6.0 sp 5 is known to be safe. However 
+read the rest of this document before continuing.
+
+For VC++ the current default is to configure wget with ssl support; 
+first get openssl (http://www.openssl.org), compile it and install 
+relevant headers and libraries where your compiler can find them; 
+currently this could mean (presuming default installation directories) 
+copy (from the compiled openssl dirctory) the whole inc32/openssl 
+directory and its contents to 
+"C:\Program Files\Microsoft Visual Studio\VC98\Include\openssl",
+and from out32dll (in the openssl directory) the two needed libraries 
+(libeay32.lib and ssleay32.lib) to 
+"C:\Program Files\Microsoft Visual Studio\VC98\lib".
+These locations aren't exactly the best but will get you started if you 
+don't know where to place these headers and libraries.
+Usually at runtime some openssl libraries (currently ssleay32.dll and
+libeay32.dll) will need to be available in your environment PATH.
 
 If you want to build the help file you will need a copy of makeinfo to
 convert wget.texi to rtf and html. I've made a copy available at
@@ -13,13 +29,9 @@ will need perl 5, one possibility is Activeperl (currently free) from
 install instructions for the current version available (since the
 packages and installation instructions change from time to time).
 
-To configure Wget with VC++ with ssl support first get openssl,
-compile it and install relevant headers and libraries where your
-compiler can find them; then uncomment the SSL related lines in
-windows\Makefile.src; then follow the normal instructions
-(configure.bat and so on).
-Usually at runtime some openssl libraries (currently ssleay32.dll and
-libeay32.dll) will need to be available in your environment PATH.
+If you don't want/can't to compile wget with openssl comment the SSL 
+related lines in windows\Makefile.src; then follow the normal 
+instructions (configure.bat and so on).
 
 Windows contributors: