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 /crypto | |
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 'crypto')
-rw-r--r-- | crypto/CMakeLists.txt | 5 | ||||
-rw-r--r-- | crypto/Makefile.am | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 12bc8ae..196ae4a 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt | |||
@@ -888,6 +888,11 @@ if(NOT HAVE_STRSEP) | |||
888 | set(EXTRA_EXPORT ${EXTRA_EXPORT} strsep) | 888 | set(EXTRA_EXPORT ${EXTRA_EXPORT} strsep) |
889 | endif() | 889 | endif() |
890 | 890 | ||
891 | if(NOT HAVE_STRTONUM) | ||
892 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/strtonum.c) | ||
893 | set(EXTRA_EXPORT ${EXTRA_EXPORT} strtonum) | ||
894 | endif() | ||
895 | |||
891 | if(NOT HAVE_SYSLOG_R) | 896 | if(NOT HAVE_SYSLOG_R) |
892 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/syslog_r.c) | 897 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/syslog_r.c) |
893 | endif() | 898 | endif() |
diff --git a/crypto/Makefile.am b/crypto/Makefile.am index 155df59..42d0dd9 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am | |||
@@ -76,6 +76,9 @@ endif | |||
76 | if !HAVE_STRSEP | 76 | if !HAVE_STRSEP |
77 | -echo strsep >> crypto_portable.sym | 77 | -echo strsep >> crypto_portable.sym |
78 | endif | 78 | endif |
79 | if !HAVE_STRTONUM | ||
80 | -echo strtonum >> crypto_portable.sym | ||
81 | endif | ||
79 | if !HAVE_TIMEGM | 82 | if !HAVE_TIMEGM |
80 | -echo timegm >> crypto_portable.sym | 83 | -echo timegm >> crypto_portable.sym |
81 | endif | 84 | endif |
@@ -175,6 +178,10 @@ if !HAVE_STRSEP | |||
175 | libcompat_la_SOURCES += compat/strsep.c | 178 | libcompat_la_SOURCES += compat/strsep.c |
176 | endif | 179 | endif |
177 | 180 | ||
181 | if !HAVE_STRTONUM | ||
182 | libcompat_la_SOURCES += compat/strtonum.c | ||
183 | endif | ||
184 | |||
178 | if !HAVE_ASPRINTF | 185 | if !HAVE_ASPRINTF |
179 | libcompat_la_SOURCES += compat/bsd-asprintf.c | 186 | libcompat_la_SOURCES += compat/bsd-asprintf.c |
180 | endif | 187 | endif |