[svn] Applied Herold's fixes for SSL to work under Windows.

Published in <412FC0AFD62ED31191B40008C7E9A11A2AAFE3@srvnt04.previnet.it>.

diff --git a/ChangeLog b/ChangeLog
index 7925286ed4035f34b3fe94d2f9f73d7c9e4e72e6..b80b76ce9ba152936e4ca3bbb71046d5e8dd09d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-14  Herold Heiko  <Heiko.Herold@previnet.it>
+
+       * windows/Makefile.src: Update for SSL.
+
 2001-05-14  Csaba Raduly  <csaba.raduly@sophos.com>
 
        * windows/Makefile.watcom: Updated.

diff --git a/windows/Makefile.src b/windows/Makefile.src
index 7fb8ccebc13b411ed9243ff3dace2ac5d1206c6a..ef2976673d7855a846e0e096db8c50adafb73f0a 100644 (file)
--- a/windows/Makefile.src
+++ b/windows/Makefile.src
@@ -19,6 +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
+
 SHELL = command
 
 VPATH       = .
@@ -38,7 +44,7 @@ LIBS     = kernel32.lib advapi32.lib wsock32.lib user32.lib
 
 INCLUDES = /I.
 
-COMPILE = $(CC) $(INCLUDES) $(CPPFLAGS) $(DEBUGCF) $(DEFS) $(CFLAGS)
+COMPILE = $(CC) $(INCLUDES) $(CPPFLAGS) $(DEBUGCF) $(DEFS) $(SSLDEFS) $(CFLAGS)
 LINK    = $(LD) $(LDFLAGS) $(DEBUGLF) /out:$@
 
 #INSTALL = @INSTALL@
@@ -49,12 +55,12 @@ RM      = del
 SRC = cmpt.c safe-ctype.c connect.c host.c http.c netrc.c ftp-basic.c ftp.c \
       ftp-ls.c ftp-opie.c getopt.c hash.c headers.c html-parse.c html-url.c \
       retr.c recur.c url.c cookies.c init.c utils.c main.c version.c \
-      mswindows.c fnmatch.c md5.c rbuf.c log.c
+      mswindows.c fnmatch.c md5.c rbuf.c log.c $(SSLSRC)
 
 OBJ = cmpt$o safe-ctype$o connect$o host$o http$o netrc$o ftp-basic$o ftp$o \
       ftp-ls$o ftp-opie$o getopt$o hash$o headers$o html-parse$o html-url$o \
       retr$o recur$o url$o cookies$o init$o utils$o main$o version$o \
-      mswindows$o fnmatch$o md5$o rbuf$o log$o
+      mswindows$o fnmatch$o md5$o rbuf$o log$o $(SSLOBJ)
 
 .SUFFIXES: .c .obj
 
@@ -66,7 +72,7 @@ OBJ = cmpt$o safe-ctype$o connect$o host$o http$o netrc$o ftp-basic$o ftp$o \
 wget: wget.exe
 
 wget.exe: $(OBJ)
-         $(LD) @<< $(LDFLAGS) $(DEBUGLF) /out:$@ $(LIBS) $(OBJ)
+         $(LD) @<< $(LDFLAGS) $(DEBUGLF) /out:$@ $(LIBS) $(SSLLIBS) $(OBJ)
 <<
         ren wget.exe WGET.EXE
 

diff --git a/windows/README b/windows/README
index 7433f3657b6a73b8f4a87af59ea88c5798025cee..dd82f1cc9a4070335aff557dfdc502048af7ca07 100644 (file)
--- a/windows/README
+++ b/windows/README
@@ -6,6 +6,14 @@ a copy of makinfo to convert wget.texi to rtf. I've made a copy
 available at <URL:ftp://sunsite.dk/projects/wget/makeinfo.zip>.  This
 copy of makeinfo is from the miktxt 1.10 archive available from ctan.
 
+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.
+
 Windows contributors:
 
 * Darko Budor <dbudor@zesoi.fer.hr> -- the initial work on the Windows