diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-10 18:51:15 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-10 19:36:48 +0100 |
| commit | e09621ff57f6965d30cc2d6b5045f93906d656a0 (patch) | |
| tree | 8dcd17b8487b8fadf7a7ed5a66c14611e26b4692 /apps/version.c | |
| parent | 9cc55ddda5bbfde2e98fb94f312b960ab11a8c60 (diff) | |
Make it possible to get ENGINESDIR info from OpenSSL_versions
Have apps/openssl display the result along with OPENSSLDIR
As part of this, add ENGINESDIR in util/mk1mf.pl
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps/version.c')
| -rw-r--r-- | apps/version.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/apps/version.c b/apps/version.c index 073aa93939..84929a5efc 100644 --- a/apps/version.c +++ b/apps/version.c @@ -141,6 +141,7 @@ OPTIONS version_options[] = { {"a", OPT_A, '-', "Show all data"}, {"b", OPT_B, '-', "Show build date"}, {"d", OPT_D, '-', "Show configuration directory"}, + {"e", OPT_D, '-', "Show engines directory"}, {"f", OPT_F, '-', "Show compiler flags used"}, {"o", OPT_O, '-', "Show some internal datatype options"}, {"p", OPT_P, '-', "Show target build platform"}, @@ -152,6 +153,7 @@ int version_main(int argc, char **argv) { int ret = 1, dirty = 0; int cflags = 0, version = 0, date = 0, options = 0, platform = 0, dir = 0; + int engdir = 0; char *prog; OPTION_CHOICE o; @@ -172,6 +174,9 @@ int version_main(int argc, char **argv) case OPT_D: dirty = dir = 1; break; + case OPT_E: + dirty = engdir = 1; + break; case OPT_F: dirty = cflags = 1; break; @@ -228,6 +233,8 @@ int version_main(int argc, char **argv) printf("%s\n", OpenSSL_version(OPENSSL_CFLAGS)); if (dir) printf("%s\n", OpenSSL_version(OPENSSL_DIR)); + if (engdir) + printf("%s\n", OpenSSL_version(OPENSSL_ENGINES_DIR)); ret = 0; end: return (ret); |