New option "-crlf" to s_client and s_server which tells them to convert

[openssl.git] / Configure

diff --git a/Configure b/Configure
index 26f029f42488d45bad10f8415473ab33f56ab2c4..b4e69b60e7e3e60bc537206dd6f874ca1761b86b 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -364,6 +364,12 @@ foreach (@ARGV)
                $algo =~ tr/[a-z]/[A-Z]/;
                $flags .= "-DNO_$algo ";
                $depflags .= "-DNO_$algo ";
+               if ($algo eq "DES")
+                       {
+                       $options .= " no-mdc2";
+                       $flags .= "-DNO_MDC2 ";
+                       $depflags .= "-DNO_MDC2 ";
+                       }
                }
        elsif (/^386$/)
                { $processor=386; }
@@ -718,20 +724,8 @@ if($IsWindows) {
 EOF
        close(OUT);
 
-       system "perl crypto/objects/obj_dat.pl <crypto/objects/objects.h >crypto/objects/obj_dat.h";
+       system "perl crypto/objects/obj_dat.pl <crypto\\objects\\objects.h >crypto\\objects\\obj_dat.h";
 } else {
-       open (OUT,">crypto/buildinf.h") || die "Can't open buildinf.h";
-       printf OUT <<EOF;
-#ifndef MK1MF_BUILD
-  /* auto-generated by Configure for crypto/cversion.c:
-   * for Unix builds, crypto/Makefile.ssl generates functional definitions;
-   * Windows builds (and other mk1mf builds) compile cversion.c with
-   * -DMK1MF_BUILD and use definitions added to this file by util/mk1mf.pl. */
-  #error "Windows builds (PLATFORM=$target) use mk1mf.pl-created Makefiles"
-#endif
-EOF
-       close(OUT);
-
        (system "make -f Makefile.ssl PERL=\'$perl\' links") == 0 or exit $?;
        ### (system 'make depend') == 0 or exit $? if $depflags ne "";
        # Run "make depend" manually if you want to be able to delete