* aclocal.m4: Don't add wcwidth.o if we don't have wchar.h.

* configure: Regenerate.
This commit is contained in:
Mark Kettenis 2003-05-27 23:29:47 +00:00
parent 756d1d0188
commit 05bc3370b8
3 changed files with 17 additions and 13 deletions

View File

@ -1,3 +1,8 @@
2003-05-25 Mark Kettenis <kettenis@gnu.org>
* aclocal.m4: Don't add wcwidth.o if we don't have wchar.h.
* configure: Regenerate.
2003-05-13 Andreas Jaeger <aj@suse.de>
* support/config.guess: Update to 2003-05-09 version.

10
readline/aclocal.m4 vendored
View File

@ -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([

15
readline/configure vendored
View File

@ -6235,20 +6235,19 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_func_wcwidth" >&5
echo "${ECHO_T}$ac_cv_func_wcwidth" >&6
if test $ac_cv_func_wcwidth = yes; then
have_wcwidth=yes
fi
if test "$have_wcwidth" = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_WCWIDTH 1
_ACEOF
else
WCWIDTH_OBJ=wcwidth.o
fi
if test "$ac_cv_func_wcwidth" = no && test "$ac_cv_header_wchar_h" = yes; then
WCWIDTH_OBJ=wcwidth.o
else
WCWIDTH_OBJ=
fi
echo "$as_me:$LINENO: checking for mbstate_t" >&5
echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6
if test "${bash_cv_have_mbstate_t+set}" = set; then