Make CC,CFLAG etc get passed to make links and various Win32 fixes.

diff --git a/CHANGES b/CHANGES
index 6454da29125d1dd297923c5459a8b9eed7d46511..1e84e4933cc9c5070e6fb2a75bcabe0d7b9d44b4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,11 @@
 
  Changes between 0.9.1c and 0.9.2
 
+  *) Fix Makefile.org so CC,CFLAG etc are passed to 'make links' add
+     advapi32.lib to Win32 build and change the pem test comparision
+     to fc.exe (thanks to Ulrich Kroener <kroneru@yahoo.com> for the
+     suggestion).
+
   *) DES quad checksum was broken on big-endian architectures. Fixed.
      [Ben Laurie]
 

diff --git a/INSTALL.W32 b/INSTALL.W32
index 8aa40023c50ada65b90f738e92097172484ee09c..6388c4c2d1f4673c6a293fd7a42da6251e9a9166 100644 (file)
--- a/INSTALL.W32
+++ b/INSTALL.W32
@@ -48,7 +48,7 @@ perl util\mkdef.pl crypto ssl update
 
 then ms\do_ms should not give a warning any more. However the numbers that get
 assigned by this technique may not match those that eventually get assigned
-in the CVS tree: so you anything linked against this version of the library
+in the CVS tree: so anything linked against this version of the library
 may need to be recompiled.
 
 If you get errors about unresolved externals then this means that either you
@@ -86,8 +86,7 @@ to make a debugging version of the library.
 
 If you want to enable the NT specific features of OpenSSL (currently only
 the logging BIO) follow the instructions above but call the batch file
-do_nt.bat instead of do_ms.bat. If you do this then you will no longer be able
-to run the OpenSSL binaries under Windows 95 or 98.
+do_nt.bat instead of do_ms.bat.
 
 You can also build a static version of the library using the Makefile ms\nt.mak
 

diff --git a/Makefile.org b/Makefile.org
index 1cb3189979a1c3e6b0f8ef94082334964f55d790..ecc4bf548ab7a264f456900135eefb1639979ff5 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -238,7 +238,7 @@ links:
        @$(TOP)/util/mklink.sh include $(EXHEADER)
        @for i in $(DIRS); do \
        (cd $$i && echo "making links in $$i..." && \
-       $(MAKE) SDIRS='${SDIRS}' links ) || exit 1; \
+       $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' links ) || exit 1; \
        done;
        @(OPENSSL="`pwd`/apps/openssl"; export OPENSSL; sh tools/c_rehash certs)
 

diff --git a/ms/testpem.bat b/ms/testpem.bat
index 203c6cabe637fd3d545cf80d3238daa26c585a41..4ee172bb99e5e5823f226ca9ceca9d94e919f961 100755 (executable)
--- a/ms/testpem.bat
+++ b/ms/testpem.bat
@@ -1,7 +1,7 @@
 echo=off\r
 set ssleay=%1%\r
 set tmp1=pem.out\r
-set cmp=perl ..\ms\cmp.pl\r
+set cmp=fc.exe\r
 \r
 call tpem.bat crl ..\test\testcrl.pem\r
 if errorlevel 1 goto err\r

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 9dca36b01bd7c1291637b3713500754c9c37b07b..8082d2ef3c4b8b8f5affbc6cb7730e5d1fdf2325 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -113,7 +113,7 @@ sub do_lib_rule
        else
                {
                local($ex)=($target =~ /O_SSL/)?' $(L_CRYPTO)':'';
-               $ex.=' wsock32.lib gdi32.lib';
+               $ex.=' wsock32.lib gdi32.lib advapi32.lib';
                $ret.="\t\$(LINK) \$(MLFLAGS) $efile$target /def:ms/${Name}.def @<<\n  \$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
                }
        $ret.="\n";