[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  7f9ae88817ddf0aac5c6bd95d9a5af1c54ed5bbf (commit)
       via  ed43fe73ea30eae1506f0f6618a09d6a5819fc28 (commit)
       via  bf98d9dab5a03b59ca45333b74ba51f58f57243b (commit)
      from  d63c12c697faa4e2fa0e5d7565521a5813c86415 (commit)


- Log -----------------------------------------------------------------
commit 7f9ae88817ddf0aac5c6bd95d9a5af1c54ed5bbf
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Aug 31 21:19:08 2016 +0200

    INSTALL: add information on option no-fuzz-test
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit ed43fe73ea30eae1506f0f6618a09d6a5819fc28
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Aug 31 21:18:52 2016 +0200

    INSTALL: add information on the environment variable BUILDFILE
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit bf98d9dab5a03b59ca45333b74ba51f58f57243b
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Aug 31 21:17:33 2016 +0200

    INSTALL: clarify OPENSSL_LOCAL_CONFIG_DIR
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 INSTALL | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/INSTALL b/INSTALL
index 3655eb7..6dcb4a0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -320,6 +320,11 @@
                    platforms and should never be used in production environments.
                    See the file fuzz/README.md for further details.
 
+  no-fuzz-test
+                   Don't runt the fuzz test suite when testing. Use with
+                   caution, as those tests may be important.  However, that
+                   suite is particularly slow, and is therefore skippable.
+
   no-gost
                    Don't build support for GOST based ciphersuites. Note that
                    if this feature is enabled then GOST ciphersuites are only
@@ -770,6 +775,13 @@
  AR
                 The name of the ar executable to use.
 
+ BUILDFILE
+                Use a different build file name than the platform default
+                ("Makefile" on Unixly platforms, "makefile" on native Windows,
+                "descrip.mms" on OpenVMS).  This requires that there is a
+                corresponding build file template.  See Configurations/README
+                for further information.
+
  CC
                 The compiler to use. Configure will attempt to pick a default
                 compiler for your platform but this choice can be overridden
@@ -786,13 +798,19 @@
 
  OPENSSL_LOCAL_CONFIG_DIR
                 OpenSSL comes with a database of information about how it
-                should be built on different platforms. This information is
-                held in ".conf" files in the Configurations directory. See the
+                should be built on different platforms as well as build file
+                templates for those platforms. The database is comprised of
+                ".conf" files in the Configurations directory.  The build
+                file templates reside there as well as ".tmpl" files. See the
                 file Configurations/README for further information about the
-                format of ".conf" files. As well as the standard ".conf" files
-                it is possible to create your own ".conf" files and store them
-                locally, outside the OpenSSL source tree. This environment
-                variable can be set to the directory where these files are held.
+                format of ".conf" files as well as information on the ".tmpl"
+                files.
+                In addition to the standard ".conf" and ".tmpl" files, it is
+                possible to create your own ".conf" and ".tmpl" files and store
+                them locally, outside the OpenSSL source tree. This environment
+                variable can be set to the directory where these files are held
+                and will have Configure to consider them in addition to the
+                standard ones.
 
  PERL
                 The name of the Perl executable to use when building OpenSSL.