From Martin Simmons:

[deliverable/binutils-gdb.git] / readline / aclocal.m4

diff --git a/readline/aclocal.m4 b/readline/aclocal.m4
index d1ad025fb0655546d53b41388d0e63f6d3eda212..35613c2702f9610d1734f8adc8f12dce0c27433d 100644 (file)
--- a/readline/aclocal.m4
+++ b/readline/aclocal.m4
@@ -1652,13 +1652,20 @@ AC_CHECK_HEADERS(wctype.h)
 AC_CHECK_HEADERS(wchar.h)
 AC_CHECK_HEADERS(langinfo.h)
 
+AC_CHECK_FUNC(mbrtowc, AC_DEFINE(HAVE_MBRTOWC))
 AC_CHECK_FUNC(mbsrtowcs, AC_DEFINE(HAVE_MBSRTOWCS))
 AC_CHECK_FUNC(wcwidth, AC_DEFINE(HAVE_WCWIDTH))
+if test "$ac_cv_func_wcwidth" = no && test "$ac_cv_header_wchar_h" = yes; then
+  WCWIDTH_OBJ=wcwidth.o
+else
+  WCWIDTH_OBJ=
+fi
+AC_SUBST(WCWIDTH_OBJ)
 
 AC_CACHE_CHECK([for mbstate_t], bash_cv_have_mbstate_t,
-[AC_TRY_RUN([
-#include <wchar.h>
-int
+[AC_TRY_LINK(
+[#include <wchar.h>],
+[int
 main ()
 {
   mbstate_t ps;