--- rxvt-unicode/configure.ac	2011/12/14 12:03:04	1.132
+++ rxvt-unicode/configure.ac	2012/02/04 21:47:06	1.141
@@ -11,8 +11,8 @@
 
 dnl RXVT version
 changequote(, )dnl
-VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
-DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
+VERSION=`sed -n -e 's/^.* VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
+DATE=`sed -n -e 's/^.* DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
 changequote([, ])dnl
 AC_SUBST(VERSION)dnl
 AC_SUBST(DATE)dnl
@@ -26,7 +26,6 @@
 dnl# Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
-AC_PROG_CPP
 AC_PROG_INSTALL
 
 AC_AIX
@@ -34,6 +33,7 @@
 AC_ISC_POSIX
 AC_LANG(C++)
 
+LINKER="$CXX"
 dnl check whether we can link with gcc -lsupc++
 if test x$GCC = xyes && test x$GXX = xyes; then
    dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it
@@ -42,14 +42,13 @@
    save_LIBS="$LIBS"
    CXX="$CC"
    LIBS="$LIBS -lsupc++"
-   LINKER="$CC"
    AC_LINK_IFELSE(
       [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])],
-      [AC_MSG_RESULT(ok)],
+      [AC_MSG_RESULT(ok)
+       LINKER="$CC"],
       [
          AC_MSG_RESULT([no, making everything bigger and slower])
          LIBS="$save_LIBS"
-         LINKER="$save_CXX"
       ]
    )
    CXX="$save_CXX"
@@ -69,12 +68,6 @@
   CFLAGS="$CXXFLAGS"
 fi
 
-case $host in
-   *-*-solaris* )
-      AC_DEFINE(_XOPEN_SOURCE, 500, Needed to get declarations for msg_control and msg_controllen on Solaris)
-      ;;
-esac
-
 dnl# FreeBSD needs to link libxpg4
 AC_SEARCH_LIBS(setlocale,     xpg4)
 
@@ -172,26 +165,26 @@
     fi
   ])
 
-ASSERTIONS=no
+support_assertions=no
 AC_ARG_ENABLE(assert,
   [  --enable-assert         enable assertions],
   [if test x$enableval = xyes; then
-    ASSERTIONS=yes
+    support_assertions=yes
   fi])
-if test x$ASSERTIONS = xno; then
+if test x$support_assertions = xno; then
   AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging))
 fi
 
-WARNINGS=no
+support_warnings=no
 AC_ARG_ENABLE(warnings,
   [  --enable-warnings       turn on g++ warnings],
   [if test x$enableval = xyes; then
-    WARNINGS=yes
+    support_warnings=yes
   fi])
 if test x$GXX = xyes; then
-  if test $WARNINGS = yes; then
+  if test $support_warnings = yes; then
     save_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor"
+    CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-unused-value"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"])
   else
     CXXFLAGS="$CXXFLAGS -w"
@@ -232,18 +225,6 @@
     support_styles=$enableval
   fi])
 
-AC_ARG_ENABLE(afterimage,
-  [  --enable-afterimage     enable integration with libAfterImage for background images (deprecated)],
-  [if test x$enableval = xyes -o x$enableval = xno; then
-    support_afterimage=$enableval
-  fi])
-
-AC_ARG_WITH(afterimage_config,
-  [  --with-afterimage-config=DIR  use libAfterImage config script in DIR],
-  [if test "x$withval" != x; then
-    afterimage_config=$withval/afterimage-config
-  fi])
-
 AC_ARG_ENABLE(pixbuf,
   [  --enable-pixbuf         enable integration with gdk-pixbuf for background images],
   [if test x$enableval = xyes -o x$enableval = xno; then
@@ -460,7 +441,6 @@
   if test x$support_pixbuf = xyes; then
     AC_MSG_RESULT(ok)
     image_lib=gdk-pixbuf
-    support_afterimage=no
     AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing)
     AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
   else
@@ -495,45 +475,6 @@
 AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
 AC_SUBST(STARTUP_NOTIFICATION_LIBS)
 
-AFTERIMAGE_CFLAGS=
-AFTERIMAGE_LIBS=
-
-if test x$support_afterimage = xyes; then
-  support_afterimage=no
-
-  if test "x$afterimage_config" = "x" ; then
-    AC_PATH_PROG(afterimage_config, afterimage-config, no)
-  fi
-  if test "x$afterimage_config" != "xno" ; then
-    AC_MSG_CHECKING(for libAfterImage version >= 1.15)
-    AFTERIMAGE_VERSION=`$afterimage_config --version`
-    if test -n "$AFTERIMAGE_VERSION" ; then
-      AFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
-      AFTERIMAGE_LIBS=`$afterimage_config --libs`
-      if test "x$AFTERIMAGE_LIBS" != "x"; then
-        libai_ver_major=`echo $AFTERIMAGE_VERSION | cut -f 1 -d .`
-        libai_ver_minor=`echo $AFTERIMAGE_VERSION | cut -f 2 -d .`
-        if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then
-          support_afterimage=yes
-        fi
-      fi
-    fi
-    if test "x$support_afterimage" = "xyes"; then
-      AC_MSG_RESULT($AFTERIMAGE_LIBS)
-      image_lib=libafterimage
-      AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
-      AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
-    else
-      AC_MSG_RESULT(no)
-      AFTERIMAGE_CFLAGS=
-      AFTERIMAGE_LIBS=
-    fi
-  fi
-fi
-
-AC_SUBST(AFTERIMAGE_CFLAGS)
-AC_SUBST(AFTERIMAGE_LIBS)
-
 dnl# --------------------------------------------------------------------------
 dnl# CHECKING FOR HEADER FILES
 dnl# --------------------------------------------------------------------------
@@ -544,7 +485,6 @@
 	sys/strredir.h \
 	stdint.h \
 	wchar.h \
-	cwchar \
 )
 
 AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
@@ -633,12 +573,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