summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2016-12-08 15:48:34 +1100
committerDarren Tucker <dtucker@zip.com.au>2016-12-08 15:48:34 +1100
commit47b8c99ab3221188ad3926108dd9d36da3b528ec (patch)
treec42c2ac76244885e43da3d9fc26718a330dc344b /configure.ac
parent4089fc1885b3a2822204effbb02b74e3da58240d (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.ac18
1 files changed, 18 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 4d9382ca7..9c8d1173b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1776,6 +1776,23 @@ CFLAGS="$CFLAGS -D_XOPEN_SOURCE"
1776AC_CHECK_FUNCS([mblen mbtowc nl_langinfo wcwidth]) 1776AC_CHECK_FUNCS([mblen mbtowc nl_langinfo wcwidth])
1777CFLAGS="$saved_CFLAGS" 1777CFLAGS="$saved_CFLAGS"
1778 1778
1779TEST_SSH_UTF8=yes
1780AC_MSG_CHECKING([for utf8 locale support])
1781AC_RUN_IFELSE(
1782 [AC_LANG_PROGRAM([[
1783#include <locale.h>
1784 ]], [[
1785 char *loc = setlocale(LC_CTYPE, "en_US.UTF-8");
1786 if (loc != NULL)
1787 exit(0);
1788 exit(1);
1789 ]])],
1790 AC_MSG_RESULT(yes),
1791 [AC_MSG_RESULT(no)
1792 TEST_SSH_UTF8=no],
1793 AC_MSG_WARN([cross compiling: assuming yes])
1794)
1795
1779AC_LINK_IFELSE( 1796AC_LINK_IFELSE(
1780 [AC_LANG_PROGRAM( 1797 [AC_LANG_PROGRAM(
1781 [[ #include <ctype.h> ]], 1798 [[ #include <ctype.h> ]],
@@ -5009,6 +5026,7 @@ else
5009fi 5026fi
5010AC_CHECK_DECL([BROKEN_GETADDRINFO], [TEST_SSH_IPV6=no]) 5027AC_CHECK_DECL([BROKEN_GETADDRINFO], [TEST_SSH_IPV6=no])
5011AC_SUBST([TEST_SSH_IPV6], [$TEST_SSH_IPV6]) 5028AC_SUBST([TEST_SSH_IPV6], [$TEST_SSH_IPV6])
5029AC_SUBST([TEST_SSH_UTF8], [$TEST_SSH_UTF8])
5012AC_SUBST([TEST_MALLOC_OPTIONS], [$TEST_MALLOC_OPTIONS]) 5030AC_SUBST([TEST_MALLOC_OPTIONS], [$TEST_MALLOC_OPTIONS])
5013AC_SUBST([UNSUPPORTED_ALGORITHMS], [$unsupported_algorithms]) 5031AC_SUBST([UNSUPPORTED_ALGORITHMS], [$unsupported_algorithms])
5014 5032