diff options
| author | Brent Cook <bcook@openbsd.org> | 2017-03-16 19:23:36 -0500 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2017-03-16 19:23:36 -0500 |
| commit | d5b247cc4fe0f3dd6cc4f7084af7f290ba41e669 (patch) | |
| tree | ecff511a1a175c88222a9c83872920d512671717 /m4 | |
| parent | 8f69fe98dba08e22dd1341cbaad91745c8bf7ad7 (diff) | |
| parent | c61c9821e8417243a5a0cf691415f5e5626f2b3b (diff) | |
| download | portable-d5b247cc4fe0f3dd6cc4f7084af7f290ba41e669.tar.gz portable-d5b247cc4fe0f3dd6cc4f7084af7f290ba41e669.tar.bz2 portable-d5b247cc4fe0f3dd6cc4f7084af7f290ba41e669.zip | |
Land #297, Add recallocarray
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/check-libc.m4 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/m4/check-libc.m4 b/m4/check-libc.m4 index 53ffce6..f9ddf73 100644 --- a/m4/check-libc.m4 +++ b/m4/check-libc.m4 | |||
| @@ -2,15 +2,18 @@ AC_DEFUN([CHECK_LIBC_COMPAT], [ | |||
| 2 | # Check for libc headers | 2 | # Check for libc headers |
| 3 | AC_CHECK_HEADERS([err.h readpassphrase.h]) | 3 | AC_CHECK_HEADERS([err.h readpassphrase.h]) |
| 4 | # Check for general libc functions | 4 | # Check for general libc functions |
| 5 | AC_CHECK_FUNCS([asprintf inet_ntop inet_pton memmem readpassphrase]) | 5 | AC_CHECK_FUNCS([asprintf getpagesize inet_ntop inet_pton memmem readpassphrase]) |
| 6 | AC_CHECK_FUNCS([reallocarray strlcat strlcpy strndup strnlen strsep strtonum]) | 6 | AC_CHECK_FUNCS([reallocarray recallocarray]) |
| 7 | AC_CHECK_FUNCS([strlcat strlcpy strndup strnlen strsep strtonum]) | ||
| 7 | AC_CHECK_FUNCS([timegm _mkgmtime]) | 8 | AC_CHECK_FUNCS([timegm _mkgmtime]) |
| 8 | AM_CONDITIONAL([HAVE_ASPRINTF], [test "x$ac_cv_func_asprintf" = xyes]) | 9 | AM_CONDITIONAL([HAVE_ASPRINTF], [test "x$ac_cv_func_asprintf" = xyes]) |
| 10 | AM_CONDITIONAL([HAVE_GETPAGESIZE], [test "x$ac_cv_func_getpagesize" = xyes]) | ||
| 9 | AM_CONDITIONAL([HAVE_INET_NTOP], [test "x$ac_cv_func_inet_ntop" = xyes]) | 11 | AM_CONDITIONAL([HAVE_INET_NTOP], [test "x$ac_cv_func_inet_ntop" = xyes]) |
| 10 | AM_CONDITIONAL([HAVE_INET_PTON], [test "x$ac_cv_func_inet_pton" = xyes]) | 12 | AM_CONDITIONAL([HAVE_INET_PTON], [test "x$ac_cv_func_inet_pton" = xyes]) |
| 11 | AM_CONDITIONAL([HAVE_MEMMEM], [test "x$ac_cv_func_memmem" = xyes]) | 13 | AM_CONDITIONAL([HAVE_MEMMEM], [test "x$ac_cv_func_memmem" = xyes]) |
| 12 | AM_CONDITIONAL([HAVE_READPASSPHRASE], [test "x$ac_cv_func_readpassphrase" = xyes]) | 14 | AM_CONDITIONAL([HAVE_READPASSPHRASE], [test "x$ac_cv_func_readpassphrase" = xyes]) |
| 13 | AM_CONDITIONAL([HAVE_REALLOCARRAY], [test "x$ac_cv_func_reallocarray" = xyes]) | 15 | AM_CONDITIONAL([HAVE_REALLOCARRAY], [test "x$ac_cv_func_reallocarray" = xyes]) |
| 16 | AM_CONDITIONAL([HAVE_RECALLOCARRAY], [test "x$ac_cv_func_recallocarray" = xyes]) | ||
| 14 | AM_CONDITIONAL([HAVE_STRLCAT], [test "x$ac_cv_func_strlcat" = xyes]) | 17 | AM_CONDITIONAL([HAVE_STRLCAT], [test "x$ac_cv_func_strlcat" = xyes]) |
| 15 | AM_CONDITIONAL([HAVE_STRLCPY], [test "x$ac_cv_func_strlcpy" = xyes]) | 18 | AM_CONDITIONAL([HAVE_STRLCPY], [test "x$ac_cv_func_strlcpy" = xyes]) |
| 16 | AM_CONDITIONAL([HAVE_STRNDUP], [test "x$ac_cv_func_strndup" = xyes]) | 19 | AM_CONDITIONAL([HAVE_STRNDUP], [test "x$ac_cv_func_strndup" = xyes]) |
| @@ -173,6 +176,9 @@ fi | |||
| 173 | if test "x$ac_cv_func_reallocarray" = "xno" ; then | 176 | if test "x$ac_cv_func_reallocarray" = "xno" ; then |
| 174 | echo reallocarray >> $crypto_p_sym | 177 | echo reallocarray >> $crypto_p_sym |
| 175 | fi | 178 | fi |
| 179 | if test "x$ac_cv_func_recallocarray" = "xno" ; then | ||
| 180 | echo recallocarray >> $crypto_p_sym | ||
| 181 | fi | ||
| 176 | if test "x$ac_cv_func_strlcat" = "xno" ; then | 182 | if test "x$ac_cv_func_strlcat" = "xno" ; then |
| 177 | echo strlcat >> $crypto_p_sym | 183 | echo strlcat >> $crypto_p_sym |
| 178 | fi | 184 | fi |