diff options
| author | kinichiro <kinichiro.inoguchi@gmail.com> | 2017-02-20 10:28:49 +0900 |
|---|---|---|
| committer | kinichiro <kinichiro.inoguchi@gmail.com> | 2017-02-20 11:50:47 +0900 |
| commit | 5297e9d486d4c0119e697d80eb53c8ef298f0bd7 (patch) | |
| tree | 2a829cb3f132f51564bc7d702b8e992caf04dfb5 /m4 | |
| parent | 9d75e5ea975fc6d1b8b6eb333416d76144f7d2ee (diff) | |
| download | portable-5297e9d486d4c0119e697d80eb53c8ef298f0bd7.tar.gz portable-5297e9d486d4c0119e697d80eb53c8ef298f0bd7.tar.bz2 portable-5297e9d486d4c0119e697d80eb53c8ef298f0bd7.zip | |
Fix condition of arc4random* and getentropy for Cygwin build
- Fix the condition of exporting getentropy
- Modify the CMake condition of including arc4random_uniform as same as autoconf
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/check-libc.m4 | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/m4/check-libc.m4 b/m4/check-libc.m4 index c66364e..53ffce6 100644 --- a/m4/check-libc.m4 +++ b/m4/check-libc.m4 | |||
| @@ -152,14 +152,13 @@ echo "generating $crypto_p_sym ..." | |||
| 152 | chmod u+w $srcdir/crypto | 152 | chmod u+w $srcdir/crypto |
| 153 | cp $crypto_sym $crypto_p_sym | 153 | cp $crypto_sym $crypto_p_sym |
| 154 | chmod u+w $crypto_p_sym | 154 | chmod u+w $crypto_p_sym |
| 155 | if test "x$ac_cv_func_arc4random" = "xno" ; then | ||
| 156 | echo arc4random >> $crypto_p_sym | ||
| 157 | fi | ||
| 158 | if test "x$ac_cv_func_arc4random_buf" = "xno" ; then | 155 | if test "x$ac_cv_func_arc4random_buf" = "xno" ; then |
| 156 | echo arc4random >> $crypto_p_sym | ||
| 159 | echo arc4random_buf >> $crypto_p_sym | 157 | echo arc4random_buf >> $crypto_p_sym |
| 160 | fi | ||
| 161 | if test "x$ac_cv_func_arc4random_uniform" = "xno" ; then | ||
| 162 | echo arc4random_uniform >> $crypto_p_sym | 158 | echo arc4random_uniform >> $crypto_p_sym |
| 159 | if test "x$ac_cv_func_getentropy" = "xno" ; then | ||
| 160 | echo getentropy >> $crypto_p_sym | ||
| 161 | fi | ||
| 163 | fi | 162 | fi |
| 164 | if test "x$ac_cv_func_asprintf" = "xno" ; then | 163 | if test "x$ac_cv_func_asprintf" = "xno" ; then |
| 165 | echo asprintf >> $crypto_p_sym | 164 | echo asprintf >> $crypto_p_sym |
| @@ -168,9 +167,6 @@ fi | |||
| 168 | if test "x$ac_cv_func_explicit_bzero" = "xno" ; then | 167 | if test "x$ac_cv_func_explicit_bzero" = "xno" ; then |
| 169 | echo explicit_bzero >> $crypto_p_sym | 168 | echo explicit_bzero >> $crypto_p_sym |
| 170 | fi | 169 | fi |
| 171 | if test "x$ac_cv_func_getentropy" = "xno" ; then | ||
| 172 | echo getentropy >> $crypto_p_sym | ||
| 173 | fi | ||
| 174 | if test "x$ac_cv_func_inet_pton" = "xno" ; then | 170 | if test "x$ac_cv_func_inet_pton" = "xno" ; then |
| 175 | echo inet_pton >> $crypto_p_sym | 171 | echo inet_pton >> $crypto_p_sym |
| 176 | fi | 172 | fi |