--- rxvt-unicode/configure.ac	2012/01/19 11:08:19	1.137
+++ rxvt-unicode/configure.ac	2012/01/19 18:17:32	1.140
@@ -26,7 +26,6 @@
 dnl# Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
-AC_PROG_CPP
 AC_PROG_INSTALL
 
 AC_AIX
@@ -538,7 +537,6 @@
 	sys/strredir.h \
 	stdint.h \
 	wchar.h \
-	cwchar \
 )
 
 AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
@@ -627,12 +625,6 @@
 LIBS=$save_LIBS
 CFLAGS=$save_CFLAGS
 
-AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])
-if test x$rxvt_cv_func_setlocale = xyes; then
-  AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
-fi
-
 AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])])
 if test x$rxvt_cv_func_nl_langinfo = xyes; then