diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2016-12-08 15:48:34 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2016-12-08 15:48:34 +1100 |
| commit | 47b8c99ab3221188ad3926108dd9d36da3b528ec (patch) | |
| tree | c42c2ac76244885e43da3d9fc26718a330dc344b /configure.ac | |
| parent | 4089fc1885b3a2822204effbb02b74e3da58240d (diff) | |
Check for utf8 local support before testing it.
Check for utf8 local support and if not found, do not attempt to run the
utf8 tests. Suggested by djm@
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 4d9382ca..9c8d1173 100644 --- a/configure.ac +++ b/configure.ac @@ -1776,6 +1776,23 @@ CFLAGS="$CFLAGS -D_XOPEN_SOURCE" AC_CHECK_FUNCS([mblen mbtowc nl_langinfo wcwidth]) CFLAGS="$saved_CFLAGS" +TEST_SSH_UTF8=yes +AC_MSG_CHECKING([for utf8 locale support]) +AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[ +#include <locale.h> + ]], [[ + char *loc = setlocale(LC_CTYPE, "en_US.UTF-8"); + if (loc != NULL) + exit(0); + exit(1); + ]])], + AC_MSG_RESULT(yes), + [AC_MSG_RESULT(no) + TEST_SSH_UTF8=no], + AC_MSG_WARN([cross compiling: assuming yes]) +) + AC_LINK_IFELSE( [AC_LANG_PROGRAM( [[ #include <ctype.h> ]], @@ -5009,6 +5026,7 @@ else fi AC_CHECK_DECL([BROKEN_GETADDRINFO], [TEST_SSH_IPV6=no]) AC_SUBST([TEST_SSH_IPV6], [$TEST_SSH_IPV6]) +AC_SUBST([TEST_SSH_UTF8], [$TEST_SSH_UTF8]) AC_SUBST([TEST_MALLOC_OPTIONS], [$TEST_MALLOC_OPTIONS]) AC_SUBST([UNSUPPORTED_ALGORITHMS], [$unsupported_algorithms]) |