mirrors
/
nano
mirror of git://git.sv.gnu.org/nano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pull in the nl_langinfo & wcwidth modules from gnulib 

These functions aren't available on mingw toolchains, so include the
gnulib modules so we can fall back on them.
This commit is contained in:
Mike Frysinger 2017-03-08 00:16:47 -08:00 committed by Benno Schulenberg
parent 69784d51db
commit 0d9a734724
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autogen.sh
View File

@ -12,6 +12,7 @@ modules="
isblank isblank
iswblank iswblank
lstat lstat
nl_langinfo
regex regex
sigaction sigaction
snprintf-posix snprintf-posix
@ -23,6 +24,7 @@ modules="
vsnprintf-posix vsnprintf-posix
wchar wchar
wctype-h wctype-h
wcwidth
" "
# Make sure the local gnulib git repo is up-to-date. # Make sure the local gnulib git repo is up-to-date.

8
configure.ac
View File

@ -469,7 +469,7 @@ int main(void)
dnl Checks for functions. dnl Checks for functions.
if test "x$enable_utf8" != xno; then if test "x$enable_utf8" != xno; then
AC_CHECK_FUNCS(iswalnum iswpunct iswspace nl_langinfo mblen mbstowcs mbtowc wctomb wcwidth) AC_CHECK_FUNCS(iswalnum iswpunct iswspace mblen mbstowcs mbtowc wctomb)
fi fi
dnl Checks for typedefs, structures, and compiler characteristics. dnl Checks for typedefs, structures, and compiler characteristics.
@ -564,13 +564,11 @@ if test "x$enable_utf8" != xno && \
test x$ac_cv_func_iswalnum = xyes && \ test x$ac_cv_func_iswalnum = xyes && \
test x$ac_cv_func_iswpunct = xyes && \ test x$ac_cv_func_iswpunct = xyes && \
(test x$ac_cv_func_iswblank = xyes || test x$ac_cv_func_iswspace = xyes) && \ (test x$ac_cv_func_iswblank = xyes || test x$ac_cv_func_iswspace = xyes) && \
test x$ac_cv_func_nl_langinfo = xyes && \
test x$ac_cv_func_mblen = xyes && \ test x$ac_cv_func_mblen = xyes && \
test x$ac_cv_func_mbstowcs = xyes && \ test x$ac_cv_func_mbstowcs = xyes && \
test x$ac_cv_func_mbtowc = xyes && \ test x$ac_cv_func_mbtowc = xyes && \
test x$ac_cv_func_wctomb = xyes && \ test x$ac_cv_func_wctomb = xyes; then
test x$ac_cv_func_wcwidth = xyes; then AC_DEFINE(ENABLE_UTF8, 1, [Define this if your system has sufficient UTF-8 support.])
AC_DEFINE(ENABLE_UTF8, 1, [Define this if your system has sufficient UTF-8 support (a wide curses library, iswalnum(), iswpunct(), iswblank() or iswspace(), nl_langinfo, mblen(), mbstowcs(), mbtowc(), wctomb(), and wcwidth()).])
else else
if test "x$enable_utf8" = xyes; then if test "x$enable_utf8" = xyes; then
AC_MSG_ERROR([ AC_MSG_ERROR([