From 0d7f39d153d09aadf1ee2ea9a3bc741270c361a0 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Tue, 27 May 2003 23:29:47 +0000 Subject: * aclocal.m4: Don't add wcwidth.o if we don't have wchar.h. * configure: Regenerate. --- readline/aclocal.m4 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'readline/aclocal.m4') diff --git a/readline/aclocal.m4 b/readline/aclocal.m4 index bc43d8db013..a87e2dcb93b 100644 --- a/readline/aclocal.m4 +++ b/readline/aclocal.m4 @@ -1654,13 +1654,13 @@ 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, have_wcwidth=yes) -if test "$have_wcwidth" = yes; then - AC_DEFINE(HAVE_WCWIDTH) - AC_SUBST(WCWIDTH_OBJ,) +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 - AC_SUBST(WCWIDTH_OBJ,wcwidth.o) + WCWIDTH_OBJ= fi +AC_SUBST(WCWIDTH_OBJ) AC_CACHE_CHECK([for mbstate_t], bash_cv_have_mbstate_t, [AC_TRY_RUN([ -- cgit v1.2.1