Continues NASM support. This might work now. Its still experimental but it

[openssl.git] / Configure

diff --git a/Configure b/Configure
index e4571dce838793f004bbd05bc057cb80e2e0371c..782cbccbbef831df2b094dcc6c5fdfcf1cca16bb 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -390,7 +390,13 @@ foreach (@ARGV)
                die "target already defined - $target\n" if ($target ne "");
                $target=$_;
                }
-       $options .= $_ unless $_ eq $target;
+       unless ($_ eq $target) {
+               if ($options eq "") {
+                       $options = $_;
+               } else {
+                       $options .= " ".$_;
+               }
+       }
 }
 
 if ($target eq "TABLE") {
@@ -682,6 +688,14 @@ print "BF_PTR2 used\n" if $bf_ptr == 2;
 if($IsWindows) {
        open (OUT,">crypto/date.h") || die "Can't open date.h";
        printf OUT "#define DATE \"%s\"\n", scalar gmtime();
+       printf OUT <<EOF; # Kludge -- usually those are passed on the command line
+#ifndef CFLAGS
+#define CFLAGS "$cc $cflags"
+#endif
+#ifndef PLATFORM
+#define PLATFORM "$target"
+#endif
+EOF
        close(OUT);
        system "perl crypto/objects/obj_dat.pl <crypto/objects/objects.h >crypto/objects/obj_dat.h";
 } else {