diff options
author | Brent Cook <busterb@gmail.com> | 2021-04-05 02:32:35 -0500 |
---|---|---|
committer | Brent Cook <busterb@gmail.com> | 2021-04-07 07:51:45 -0500 |
commit | 921c0675a25708d19e76aa8e3b48c4483a1a255d (patch) | |
tree | d68d125cdc968fd96cca6835fc347a2c8698a6ca /apps | |
parent | 141f7528cb5610becd963d8c403c5b14afe73634 (diff) | |
download | portable-921c0675a25708d19e76aa8e3b48c4483a1a255d.tar.gz portable-921c0675a25708d19e76aa8e3b48c4483a1a255d.tar.bz2 portable-921c0675a25708d19e76aa8e3b48c4483a1a255d.zip |
Add '--enable-libtls-only' build option
Diffstat (limited to 'apps')
-rw-r--r-- | apps/ocspcheck/Makefile.am | 5 | ||||
-rw-r--r-- | apps/openssl/CMakeLists.txt | 10 | ||||
-rw-r--r-- | apps/openssl/Makefile.am | 36 |
3 files changed, 9 insertions, 42 deletions
diff --git a/apps/ocspcheck/Makefile.am b/apps/ocspcheck/Makefile.am index e3f7971..71a73ea 100644 --- a/apps/ocspcheck/Makefile.am +++ b/apps/ocspcheck/Makefile.am | |||
@@ -1,8 +1,11 @@ | |||
1 | include $(top_srcdir)/Makefile.am.common | 1 | include $(top_srcdir)/Makefile.am.common |
2 | 2 | ||
3 | if !ENABLE_LIBTLS_ONLY | ||
3 | bin_PROGRAMS = ocspcheck | 4 | bin_PROGRAMS = ocspcheck |
4 | |||
5 | dist_man_MANS = ocspcheck.8 | 5 | dist_man_MANS = ocspcheck.8 |
6 | else | ||
7 | noinst_PROGRAMS = ocspcheck | ||
8 | endif | ||
6 | 9 | ||
7 | EXTRA_DIST = ocspcheck.8 | 10 | EXTRA_DIST = ocspcheck.8 |
8 | EXTRA_DIST += CMakeLists.txt | 11 | EXTRA_DIST += CMakeLists.txt |
diff --git a/apps/openssl/CMakeLists.txt b/apps/openssl/CMakeLists.txt index 752f3ec..b9cd222 100644 --- a/apps/openssl/CMakeLists.txt +++ b/apps/openssl/CMakeLists.txt | |||
@@ -83,13 +83,3 @@ if(ENABLE_LIBRESSL_INSTALL) | |||
83 | install(TARGETS openssl DESTINATION ${CMAKE_INSTALL_BINDIR}) | 83 | install(TARGETS openssl DESTINATION ${CMAKE_INSTALL_BINDIR}) |
84 | install(FILES openssl.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) | 84 | install(FILES openssl.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) |
85 | endif(ENABLE_LIBRESSL_INSTALL) | 85 | endif(ENABLE_LIBRESSL_INSTALL) |
86 | |||
87 | if(NOT "${OPENSSLDIR}" STREQUAL "") | ||
88 | set(CONF_DIR "${OPENSSLDIR}") | ||
89 | else() | ||
90 | set(CONF_DIR "${CMAKE_INSTALL_PREFIX}/etc/ssl") | ||
91 | endif() | ||
92 | if(ENABLE_LIBRESSL_INSTALL) | ||
93 | install(FILES cert.pem openssl.cnf x509v3.cnf DESTINATION ${CONF_DIR}) | ||
94 | install(DIRECTORY DESTINATION ${CONF_DIR}/certs) | ||
95 | endif(ENABLE_LIBRESSL_INSTALL) | ||
diff --git a/apps/openssl/Makefile.am b/apps/openssl/Makefile.am index 0bd8ca4..b98e08d 100644 --- a/apps/openssl/Makefile.am +++ b/apps/openssl/Makefile.am | |||
@@ -1,8 +1,11 @@ | |||
1 | include $(top_srcdir)/Makefile.am.common | 1 | include $(top_srcdir)/Makefile.am.common |
2 | 2 | ||
3 | if !ENABLE_LIBTLS_ONLY | ||
3 | bin_PROGRAMS = openssl | 4 | bin_PROGRAMS = openssl |
4 | |||
5 | dist_man_MANS = openssl.1 | 5 | dist_man_MANS = openssl.1 |
6 | else | ||
7 | noinst_PROGRAMS = openssl | ||
8 | endif | ||
6 | 9 | ||
7 | openssl_LDADD = $(abs_top_builddir)/ssl/libssl.la | 10 | openssl_LDADD = $(abs_top_builddir)/ssl/libssl.la |
8 | openssl_LDADD += $(abs_top_builddir)/crypto/libcrypto.la | 11 | openssl_LDADD += $(abs_top_builddir)/crypto/libcrypto.la |
@@ -92,34 +95,5 @@ noinst_HEADERS += testdsa.h | |||
92 | noinst_HEADERS += testrsa.h | 95 | noinst_HEADERS += testrsa.h |
93 | noinst_HEADERS += timeouts.h | 96 | noinst_HEADERS += timeouts.h |
94 | 97 | ||
95 | EXTRA_DIST = cert.pem | 98 | EXTRA_DIST = CMakeLists.txt |
96 | EXTRA_DIST += openssl.cnf | ||
97 | EXTRA_DIST += x509v3.cnf | ||
98 | EXTRA_DIST += CMakeLists.txt | ||
99 | |||
100 | install-exec-hook: | ||
101 | @if [ "@OPENSSLDIR@x" != "x" ]; then \ | ||
102 | OPENSSLDIR="$(DESTDIR)@OPENSSLDIR@"; \ | ||
103 | else \ | ||
104 | OPENSSLDIR="$(DESTDIR)$(sysconfdir)/ssl"; \ | ||
105 | fi; \ | ||
106 | mkdir -p "$$OPENSSLDIR/certs"; \ | ||
107 | for i in cert.pem openssl.cnf x509v3.cnf; do \ | ||
108 | if [ ! -f "$$OPENSSLDIR/$i" ]; then \ | ||
109 | $(INSTALL) -m 644 "$(srcdir)/$$i" "$$OPENSSLDIR/$$i"; \ | ||
110 | else \ | ||
111 | echo " $$OPENSSLDIR/$$i already exists, install will not overwrite"; \ | ||
112 | fi \ | ||
113 | done | ||
114 | 99 | ||
115 | uninstall-local: | ||
116 | @if [ "@OPENSSLDIR@x" != "x" ]; then \ | ||
117 | OPENSSLDIR="$(DESTDIR)@OPENSSLDIR@"; \ | ||
118 | else \ | ||
119 | OPENSSLDIR="$(DESTDIR)$(sysconfdir)/ssl"; \ | ||
120 | fi; \ | ||
121 | for i in cert.pem openssl.cnf x509v3.cnf; do \ | ||
122 | if cmp -s "$$OPENSSLDIR/$$i" "$(srcdir)/$$i"; then \ | ||
123 | rm -f "$$OPENSSLDIR/$$i"; \ | ||
124 | fi \ | ||
125 | done | ||