diff --git a/configure b/configure index bbd6297d32..43672d8e7f 100755 --- a/configure +++ b/configure @@ -16393,7 +16393,7 @@ fi done -for ac_func in asprintf atexit closefrom dup2 eaccess endpwent euidaccess ffsll ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday glob ioperm inet_ntoa isascii memchr memmove memset mkdir mkdtemp munmap newlocale ppoll putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtod strtol strtold strtoq unsetenv utime vasprintf getpeereid sysctl swapctl +for ac_func in asprintf atexit closefrom dup2 eaccess endpwent euidaccess ffsll ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday glob ioperm inet_ntoa isascii memchr memmove memset mkdir mkdtemp munmap newlocale ppoll putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtod strtol strtold strtoq unsetenv uselocale utime vasprintf getpeereid sysctl swapctl do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/configure.ac b/configure.ac index 71c70d682a..51743c26c9 100644 --- a/configure.ac +++ b/configure.ac @@ -717,7 +717,7 @@ AC_FUNC_STRNLEN AC_FUNC_STRTOD AC_FUNC_UTIME_NULL AC_FUNC_VPRINTF -AC_CHECK_FUNCS([asprintf atexit closefrom dup2 eaccess endpwent euidaccess ffsll ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday glob ioperm inet_ntoa isascii memchr memmove memset mkdir mkdtemp munmap newlocale ppoll putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtod strtol strtold strtoq unsetenv utime vasprintf getpeereid sysctl swapctl]) +AC_CHECK_FUNCS([asprintf atexit closefrom dup2 eaccess endpwent euidaccess ffsll ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday glob ioperm inet_ntoa isascii memchr memmove memset mkdir mkdtemp munmap newlocale ppoll putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtod strtol strtold strtoq unsetenv uselocale utime vasprintf getpeereid sysctl swapctl]) AC_MSG_CHECKING(for htonll) AC_LINK_IFELSE( diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index c046253ab2..0615ea7a03 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -1136,6 +1136,9 @@ /* Define to 1 if you have the uriparser library library. */ #undef HAVE_URIPARSER +/* Define to 1 if you have the `uselocale' function. */ +#undef HAVE_USELOCALE + /* Define to 1 if you have the `utime' function. */ #undef HAVE_UTIME diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c index f8050c95ce..8b87b26b74 100644 --- a/main/stdtime/localtime.c +++ b/main/stdtime/localtime.c @@ -312,7 +312,7 @@ static struct state * sstate_alloc(void); static void sstate_free(struct state *p); static AST_LIST_HEAD_STATIC(zonelist, state); -#ifdef HAVE_NEWLOCALE +#if defined(HAVE_NEWLOCALE) && defined(HAVE_USELOCALE) static AST_LIST_HEAD_STATIC(localelist, locale_entry); #endif @@ -2364,7 +2364,7 @@ struct timeval ast_mktime(struct ast_tm *tmp, const char *zone) return time1(tmp, localsub, 0L, sp); } -#ifdef HAVE_NEWLOCALE +#if defined(HAVE_NEWLOCALE) && defined(HAVE_USELOCALE) static struct locale_entry *find_by_locale(locale_t locale) { struct locale_entry *cur;