aboutsummaryrefslogtreecommitdiff
path: root/apps/nc
diff options
context:
space:
mode:
authorkinichiro <kinichiro.inoguchi@gmail.com>2021-12-26 15:42:47 +0900
committerkinichiro <kinichiro.inoguchi@gmail.com>2021-12-26 16:00:25 +0900
commitadde656bb7a859fb4cc334cb89a00840a7023c2e (patch)
treef366c790f1e3afc3782b7f5224a823b2c9b8993b /apps/nc
parent1b95c5d584c5db4f08160299f5bf66acf654875d (diff)
downloadportable-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/nc')
-rw-r--r--apps/nc/CMakeLists.txt8
-rw-r--r--apps/nc/Makefile.am4
2 files changed, 0 insertions, 12 deletions
diff --git a/apps/nc/CMakeLists.txt b/apps/nc/CMakeLists.txt
index e873de8..bd59211 100644
--- a/apps/nc/CMakeLists.txt
+++ b/apps/nc/CMakeLists.txt
@@ -29,14 +29,6 @@ else()
29 set(NC_SRC ${NC_SRC} compat/readpassphrase.c) 29 set(NC_SRC ${NC_SRC} compat/readpassphrase.c)
30endif() 30endif()
31 31
32check_function_exists(strtonum HAVE_STRTONUM)
33if(HAVE_STRTONUM AND CMAKE_SYSTEM_NAME MATCHES "Darwin" AND
34 CMAKE_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20)
35 add_definitions(-DHAVE_STRTONUM)
36else()
37 set(NC_SRC ${NC_SRC} compat/strtonum.c)
38endif()
39
40if(NOT "${OPENSSLDIR}" STREQUAL "") 32if(NOT "${OPENSSLDIR}" STREQUAL "")
41 add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\") 33 add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
42else() 34else()
diff --git a/apps/nc/Makefile.am b/apps/nc/Makefile.am
index 58b5c01..e9db6e5 100644
--- a/apps/nc/Makefile.am
+++ b/apps/nc/Makefile.am
@@ -43,8 +43,4 @@ if !HAVE_READPASSPHRASE
43nc_SOURCES += compat/readpassphrase.c 43nc_SOURCES += compat/readpassphrase.c
44endif 44endif
45 45
46if !HAVE_STRTONUM
47nc_SOURCES += compat/strtonum.c
48endif
49
50endif 46endif