Configure fix for Windows: under Windows+perl "system" ends up going via the

[openssl.git] / Configure

diff --git a/Configure b/Configure
index fbac48e3997c5d370f07ca7b2543e616acd882fd..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; }
@@ -708,16 +714,17 @@ print "BF_PTR2 used\n" if $bf_ptr == 2;
 if($IsWindows) {
        open (OUT,">crypto/buildinf.h") || die "Can't open buildinf.h";
        printf OUT <<EOF;
-/* auto-generated by Configure for crypto/cversion.c */
-/* (Unix builds: auto-generated by crypto/Makefile.ssl) */
-/* mk1mf builds use mk1mfinf.h instead, so this file is probably never needed */
-#define CFLAGS "$cc $cflags"
-#define PLATFORM "$target"
+#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
-       printf OUT "#define DATE \"%s\"\n", scalar gmtime();
        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 {
        (system "make -f Makefile.ssl PERL=\'$perl\' links") == 0 or exit $?;
        ### (system 'make depend') == 0 or exit $? if $depflags ne "";