936c936
< AC_DEFUN(BASH_CHECK_LIB_TERMCAP,
---
> AC_DEFUN([BASH_CHECK_LIB_TERMCAP],
1543c1543,1544
< [if test -d /dev/fd && test -r /dev/fd/0 < /dev/null; then
---
> [bash_cv_dev_fd=""
> if test -d /dev/fd && test -r /dev/fd/0 < /dev/null; then
1545c1546
< exec 3<&0
---
> exec 3</dev/null
1552,1556c1553,1560
< elif test -d /proc/self/fd && test -r /proc/self/fd/0 < /dev/null; then
< bash_cv_dev_fd=whacky
< else
< bash_cv_dev_fd=absent
< fi
---
> fi
> if test -z "$bash_cv_dev_fd" ; then
> if test -d /proc/self/fd && test -r /proc/self/fd/0 < /dev/null; then
> bash_cv_dev_fd=whacky
> else
> bash_cv_dev_fd=absent
> fi
> fi
1669a1674,1675
> dnl geez, I wish I didn't have to check for all of this stuff separately
> dnl
1677d1682
< AC_CHECK_FUNC(mbrtowc, AC_DEFINE(HAVE_MBRTOWC))
1679,1680c1684,1686
< AC_CHECK_FUNC(wctomb, AC_DEFINE(HAVE_WCTOMB))
< AC_CHECK_FUNC(wcwidth, AC_DEFINE(HAVE_WCWIDTH))
---
>
> AC_CHECK_FUNC(wcrtomb, AC_DEFINE(HAVE_WCRTOMB))
> AC_CHECK_FUNC(wcscoll, AC_DEFINE(HAVE_WCSCOLL))
1681a1688,1689
> AC_CHECK_FUNC(wcwidth, AC_DEFINE(HAVE_WCWIDTH))
> AC_CHECK_FUNC(wctype, AC_DEFINE(HAVE_WCTYPE))
1683,1690c1691,1693
< AC_CACHE_CHECK([for mbstate_t], bash_cv_have_mbstate_t,
< [AC_TRY_COMPILE([
< #include <wchar.h>], [
< mbstate_t ps;
< mbstate_t *psp;
< psp = (mbstate_t *)0;
< ], bash_cv_have_mbstate_t=yes, bash_cv_have_mbstate_t=no)])
< if test $bash_cv_have_mbstate_t = yes; then
---
> dnl checks for both mbrtowc and mbstate_t
> AC_FUNC_MBRTOWC
> if test $ac_cv_func_mbrtowc = yes; then
1693a1697,1698
> AC_CHECK_FUNCS(iswlower iswupper towlower towupper iswctype)
>
1702a1708,1744
> dnl check for wchar_t in <wchar.h>
> AC_CACHE_CHECK([for wchar_t in wchar.h], bash_cv_type_wchar_t,
> [AC_TRY_COMPILE(
> [#include <wchar.h>
> ],
> [
> wchar_t foo;
> foo = 0;
> ], bash_cv_type_wchar_t=yes, bash_cv_type_wchar_t=no)])
> if test $bash_cv_type_wchar_t = yes; then
> AC_DEFINE(HAVE_WCHAR_T, 1, [systems should define this type here])
> fi
>
> dnl check for wctype_t in <wctype.h>
> AC_CACHE_CHECK([for wctype_t in wctype.h], bash_cv_type_wctype_t,
> [AC_TRY_COMPILE(
> [#include <wctype.h>],
> [
> wctype_t foo;
> foo = 0;
> ], bash_cv_type_wctype_t=yes, bash_cv_type_wctype_t=no)])
> if test $bash_cv_type_wctype_t = yes; then
> AC_DEFINE(HAVE_WCTYPE_T, 1, [systems should define this type here])
> fi
>
> dnl check for wint_t in <wctype.h>
> AC_CACHE_CHECK([for wint_t in wctype.h], bash_cv_type_wint_t,
> [AC_TRY_COMPILE(
> [#include <wctype.h>],
> [
> wint_t foo;
> foo = 0;
> ], bash_cv_type_wint_t=yes, bash_cv_type_wint_t=no)])
> if test $bash_cv_type_wint_t = yes; then
> AC_DEFINE(HAVE_WINT_T, 1, [systems should define this type here])
> fi
>
1710c1752
< AC_DEFUN(RL_LIB_READLINE_VERSION,
---
> AC_DEFUN([RL_LIB_READLINE_VERSION],