AC_HEADER_DIRENT
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h sys/file.h unistd.h paths.h sys/param.h)
+AC_CHECK_HEADERS(fcntl.h sys/file.h unistd.h paths.h sys/param.h \
+ wchar.h wctype.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_TYPE_PID_T
AC_TYPE_SIZE_T
AC_STRUCT_TM
-AC_CHECK_TYPE(wint_t, unsigned int)
+sv_CHECK_TYPE(wint_t, unsigned int,
+[
+#if (HAVE_WCHAR_H && HAVE_WCTYPE_H)
+#include <wchar.h>
+#endif
+])
dnl Checks for library functions.
AC_FUNC_ALLOCA
-AC_CHECK_HEADERS(wchar.h wctype.h)
AC_CHECK_FUNCS(gethostname mkdir mktime socket strstr \
wcsstr wcswcs iswalnum iswspace towlower \
wcslen wcscpy wcsncpy \