diff options
author | kinichiro <kinichiro.inoguchi@gmail.com> | 2021-12-26 15:42:47 +0900 |
---|---|---|
committer | kinichiro <kinichiro.inoguchi@gmail.com> | 2021-12-26 16:00:25 +0900 |
commit | adde656bb7a859fb4cc334cb89a00840a7023c2e (patch) | |
tree | f366c790f1e3afc3782b7f5224a823b2c9b8993b /apps/ocspcheck | |
parent | 1b95c5d584c5db4f08160299f5bf66acf654875d (diff) | |
download | portable-adde656bb7a859fb4cc334cb89a00840a7023c2e.tar.gz portable-adde656bb7a859fb4cc334cb89a00840a7023c2e.tar.bz2 portable-adde656bb7a859fb4cc334cb89a00840a7023c2e.zip |
Add strtonum to compat library and export it
crypto library requires strtonum now, and add it to compat library.
remove it from applications compat/ directories.
Diffstat (limited to 'apps/ocspcheck')
-rw-r--r-- | apps/ocspcheck/CMakeLists.txt | 8 | ||||
-rw-r--r-- | apps/ocspcheck/Makefile.am | 4 |
2 files changed, 0 insertions, 12 deletions
diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt index 249f0f4..2dddb6e 100644 --- a/apps/ocspcheck/CMakeLists.txt +++ b/apps/ocspcheck/CMakeLists.txt | |||
@@ -13,14 +13,6 @@ else() | |||
13 | set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c) | 13 | set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c) |
14 | endif() | 14 | endif() |
15 | 15 | ||
16 | check_function_exists(strtonum HAVE_STRTONUM) | ||
17 | if(HAVE_STRTONUM AND CMAKE_SYSTEM_NAME MATCHES "Darwin" AND | ||
18 | CMAKE_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20) | ||
19 | add_definitions(-DHAVE_STRTONUM) | ||
20 | else() | ||
21 | set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/strtonum.c) | ||
22 | endif() | ||
23 | |||
24 | if(NOT "${OPENSSLDIR}" STREQUAL "") | 16 | if(NOT "${OPENSSLDIR}" STREQUAL "") |
25 | add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\") | 17 | add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\") |
26 | else() | 18 | else() |
diff --git a/apps/ocspcheck/Makefile.am b/apps/ocspcheck/Makefile.am index 71a73ea..7c7b454 100644 --- a/apps/ocspcheck/Makefile.am +++ b/apps/ocspcheck/Makefile.am | |||
@@ -22,7 +22,3 @@ noinst_HEADERS = http.h | |||
22 | if !HAVE_MEMMEM | 22 | if !HAVE_MEMMEM |
23 | ocspcheck_SOURCES += compat/memmem.c | 23 | ocspcheck_SOURCES += compat/memmem.c |
24 | endif | 24 | endif |
25 | |||
26 | if !HAVE_STRTONUM | ||
27 | ocspcheck_SOURCES += compat/strtonum.c | ||
28 | endif | ||