--- rxvt-unicode/configure.ac	2006/02/02 14:41:00	1.35
+++ rxvt-unicode/configure.ac	2007/05/07 13:42:23	1.37
@@ -501,7 +501,8 @@
 CFLAGS="$CFLAGS $X_CFLAGS"
 LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
 AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath,
-[AC_RUN_IFELSE([AC_LANG_SOURCE([[
+[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
+#include <stdlib.h>
 main()
 {
     exit(0);
@@ -514,7 +515,8 @@
   changequote([, ])dnl
   LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
   AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R,
-[AC_RUN_IFELSE([AC_LANG_SOURCE([[
+[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
+#include <stdlib.h>
 main()
 {
     exit(0);
@@ -686,6 +688,7 @@
 fi
 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
+#include <stdlib.h>
 main() {
 char *p;
 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
@@ -963,7 +966,7 @@
   Source code location:       $srcdir
   Install path:               ${prefix}/bin
   Compiler:                   $CXX
-  Compiler flags:             $CFLAGS
+  Compiler flags:             $CXXFLAGS
   Linker:                     $LINKER"
 
 if test x$support_xpm = xyes; then