development / crossrootfs.git / blame
| Commit | Line | Data |
|---|---|---|
| f4849e73 VM |
1 | diff -ur original/readline-6.3/configure build/readline-6.3/configure |
| 2 | --- original/readline-6.3/configure 2013-03-13 23:14:53.000000000 +0900 | |
| 3 | +++ build/readline-6.3/configure 2014-04-28 22:52:45.510169436 +0900 | |
| 4 | @@ -6316,49 +6316,49 @@ | |
| 5 | ||
| 6 | fi | |
| 7 | ||
| 8 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wcwidth broken with unicode combining characters" >&5 | |
| 9 | -$as_echo_n "checking for wcwidth broken with unicode combining characters... " >&6; } | |
| 10 | -if ${bash_cv_wcwidth_broken+:} false; then : | |
| 11 | - $as_echo_n "(cached) " >&6 | |
| 12 | -else | |
| 13 | - if test "$cross_compiling" = yes; then : | |
| 14 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | |
| 15 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | |
| 16 | -as_fn_error $? "cannot run test program while cross compiling | |
| 17 | -See \`config.log' for more details" "$LINENO" 5; } | |
| 18 | -else | |
| 19 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |
| 20 | -/* end confdefs.h. */ | |
| 21 | - | |
| 22 | -#include <unistd.h> | |
| 23 | -#include <stdlib.h> | |
| 24 | -#include <stdio.h> | |
| 25 | - | |
| 26 | -#include <locale.h> | |
| 27 | -#include <wchar.h> | |
| 28 | - | |
| 29 | -main(c, v) | |
| 30 | -int c; | |
| 31 | -char **v; | |
| 32 | -{ | |
| 33 | - int w; | |
| 34 | - | |
| 35 | - setlocale(LC_ALL, "en_US.UTF-8"); | |
| 36 | - w = wcwidth (0x0301); | |
| 37 | - exit (w == 0); /* exit 0 if wcwidth broken */ | |
| 38 | -} | |
| 39 | - | |
| 40 | -_ACEOF | |
| 41 | -if ac_fn_c_try_run "$LINENO"; then : | |
| 42 | - bash_cv_wcwidth_broken=yes | |
| 43 | -else | |
| 44 | - bash_cv_wcwdith_broken=no | |
| 45 | -fi | |
| 46 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | |
| 47 | - conftest.$ac_objext conftest.beam conftest.$ac_ext | |
| 48 | -fi | |
| 49 | - | |
| 50 | -fi | |
| 51 | +#{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wcwidth broken with unicode combining characters" >&5 | |
| 52 | +#$as_echo_n "checking for wcwidth broken with unicode combining characters... " >&6; } | |
| 53 | +#if ${bash_cv_wcwidth_broken+:} false; then : | |
| 54 | +# $as_echo_n "(cached) " >&6 | |
| 55 | +#else | |
| 56 | +# if test "$cross_compiling" = yes; then : | |
| 57 | +# { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | |
| 58 | +#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | |
| 59 | +#as_fn_error $? "cannot run test program while cross compiling | |
| 60 | +#See \`config.log' for more details" "$LINENO" 5; } | |
| 61 | +#else | |
| 62 | +# cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |
| 63 | +#/* end confdefs.h. */ | |
| 64 | +# | |
| 65 | +##include <unistd.h> | |
| 66 | +##include <stdlib.h> | |
| 67 | +##include <stdio.h> | |
| 68 | +# | |
| 69 | +##include <locale.h> | |
| 70 | +##include <wchar.h> | |
| 71 | +# | |
| 72 | +#main(c, v) | |
| 73 | +#int c; | |
| 74 | +#char **v; | |
| 75 | +#{ | |
| 76 | +# int w; | |
| 77 | +# | |
| 78 | +# setlocale(LC_ALL, "en_US.UTF-8"); | |
| 79 | +# w = wcwidth (0x0301); | |
| 80 | +# exit (w == 0); /* exit 0 if wcwidth broken */ | |
| 81 | +#} | |
| 82 | +# | |
| 83 | +#_ACEOF | |
| 84 | +#if ac_fn_c_try_run "$LINENO"; then : | |
| 85 | +# bash_cv_wcwidth_broken=yes | |
| 86 | +#else | |
| 87 | +# bash_cv_wcwdith_broken=no | |
| 88 | +#fi | |
| 89 | +#rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | |
| 90 | +# conftest.$ac_objext conftest.beam conftest.$ac_ext | |
| 91 | +#fi | |
| 92 | +bash_cv_wcwdith_broken=no | |
| 93 | +#fi | |
| 94 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bash_cv_wcwidth_broken" >&5 | |
| 95 | $as_echo "$bash_cv_wcwidth_broken" >&6; } | |
| 96 | if test "$bash_cv_wcwidth_broken" = yes; then | |
| 97 |