Fix no-ocsp

[openssl.git] / Configurations / 00-base-templates.conf

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 3424f1208920c5d2cbbff318a3232437ff1ca955..5fe038cc02f3d32953d9ecf6d22d62e7d0955ee3 100644 (file)
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -5,11 +5,7 @@
 
        cflags          => "",
        defines         => [],
-       debug_cflags    => "",
-       debug_defines   => [],
-       release_cflags  => "",
-       release_defines => [],
-       thread_cflags   => "",
+       thread_scheme   => "(unknown)", # Assume we don't know
        thread_defines  => [],
 
        apps_aux_src    => "",
@@ -40,18 +36,43 @@
        shared_rcflag   => "",
        shared_extension        => "",
 
-       build_scheme    => "unixmake",
-       build_file      => "Makefile",
+        build_scheme    => [ "unified", "unix" ],
+        build_file      => "Makefile",
     },
 
     BASE_common => {
+       template        => 1,
+       defines         =>
+           [ sub {
+               unless ($disabled{zlib}) {
+                   if (defined($disabled{"zlib-dynamic"})) {
+                       return "ZLIB";
+                   } else {
+                       return "ZLIB_SHARED";
+                   }
+               }
+               return (); }
+           ],
     },
 
     BASE_unix => {
         inherit_from    => [ "BASE_common" ],
         template        => 1,
 
-        build_scheme    => "unixmake",
+        ex_libs         =>
+            sub {
+                unless ($disabled{zlib}) {
+                    if (defined($disabled{"zlib-dynamic"})) {
+                        if (defined($withargs{zlib_lib})) {
+                            return "-L".$withargs{zlib_lib}." -lz";
+                        } else {
+                            return "-lz";
+                        }
+                    }
+                }
+                return (); },
+
+        build_scheme    => [ "unified", "unix" ],
         build_file      => "Makefile",
     },
 
@@ -59,13 +80,43 @@
         inherit_from    => [ "BASE_common" ],
         template        => 1,
 
-        build_scheme    => [ "mk1mf" ],
+        ex_libs         =>
+            sub {
+                unless ($disabled{zlib}) {
+                    if (defined($disabled{"zlib-dynamic"})) {
+                        return "zlib1.lib";
+                    }
+                }
+                return (); },
+
+        ld              => "link",
+        lflags          => "/nologo",
+        loutflag        => "/out:",
+        ar              => "lib",
+        arflags         => "/nologo",
+        aroutflag       => "/out:",
+
+        build_file      => "makefile",
+        build_scheme    => [ "unified", "windows" ],
     },
 
     BASE_VMS => {
         inherit_from    => [ "BASE_common" ],
         template        => 1,
 
+        ex_libs          =>
+            sub {
+                unless ($disabled{zlib}) {
+                    if (defined($disabled{"zlib-dynamic"})) {
+                        if (defined($withargs{zlib_lib})) {
+                            return $withargs{zlib_lib}.'GNV$LIBZSHR.EXE/SHARED'
+                        } else {
+                            return 'GNV$LIBZSHR/SHARE';
+                        }
+                    }
+                }
+                return (); },
+
         build_file       => "descrip.mms",
         build_scheme     => [ "unified", "VMS" ],
     },
@@ -74,7 +125,7 @@
        template        => 1,
        apps_aux_src    => add("../ms/applink.c"),
        uplink_aux_src  => add("../ms/uplink.c"),
-       shared_defines  => add("OPENSSL_USE_APPLINK", { separator => undef }),
+       defines         => add("OPENSSL_USE_APPLINK"),
     },
     x86_uplink => {
        inherit_from    => [ "uplink_common" ],
@@ -148,14 +199,14 @@
     sparcv9_asm => {
        template        => 1,
        cpuid_asm_src   => "sparcv9cap.c sparccpuid.S",
-       bn_asm_src      => "asm/sparcv8plus.S sparcv9-mont.s sparcv9a-mont.s vis3-mont.s sparct4-mont.S sparcv9-gf2m.S",
+       bn_asm_src      => "asm/sparcv8plus.S sparcv9-mont.S sparcv9a-mont.S vis3-mont.S sparct4-mont.S sparcv9-gf2m.S",
        ec_asm_src      => "ecp_nistz256.c ecp_nistz256-sparcv9.S",
-       des_asm_src     => "des_enc-sparc.S fcrypt_b.c dest4-sparcv9.s",
-       aes_asm_src     => "aes_core.c aes_cbc.c aes-sparcv9.s aest4-sparcv9.s",
+       des_asm_src     => "des_enc-sparc.S fcrypt_b.c dest4-sparcv9.S",
+       aes_asm_src     => "aes_core.c aes_cbc.c aes-sparcv9.S aest4-sparcv9.S",
        md5_asm_src     => "md5-sparcv9.S",
        sha1_asm_src    => "sha1-sparcv9.S sha256-sparcv9.S sha512-sparcv9.S",
-       cmll_asm_src    => "camellia.c cmll_misc.c cmll_cbc.c cmllt4-sparcv9.s",
-       modes_asm_src   => "ghash-sparcv9.s",
+       cmll_asm_src    => "camellia.c cmll_misc.c cmll_cbc.c cmllt4-sparcv9.S",
+       modes_asm_src   => "ghash-sparcv9.S",
        poly1305_asm_src=> "poly1305-sparcv9.S",
        perlasm_scheme  => "void"
     },
@@ -187,7 +238,7 @@
     },
     s390x_asm => {
        template        => 1,
-       cpuid_asm_src   => "s390xcap.c s390xcpuid.s",
+       cpuid_asm_src   => "s390xcap.c s390xcpuid.S",
        bn_asm_src      => "asm/s390x.S s390x-mont.S s390x-gf2m.s",
        aes_asm_src     => "aes-s390x.S aes-ctr.fake aes-xts.fake",
        sha1_asm_src    => "sha1-s390x.S sha256-s390x.S sha512-s390x.S",