--- rxvt-unicode/configure	2011/11/27 15:18:44	1.149
+++ rxvt-unicode/configure	2012/01/19 11:09:56	1.151
@@ -1377,7 +1377,7 @@
   --enable-combining      enable composition of base and combining characters
   --enable-xft            enable xft support on systems that have it
   --enable-font-styles    enable bold and italic support
-  --enable-afterimage     enable integration with libAfterImage for background images
+  --enable-afterimage     enable integration with libAfterImage for background images (deprecated)
   --enable-pixbuf         enable integration with gdk-pixbuf for background images
   --enable-startup-notification  enable freedesktop startup notification support
   --enable-transparency   enable transparent backgrounds
@@ -2748,8 +2748,8 @@
 
 
 
-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`
 
 echo ""
 echo "configuring for rxvt $VERSION"
@@ -4422,6 +4422,7 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
+LINKER="$CXX"
 if test x$GCC = xyes && test x$GXX = xyes; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working libsupc++" >&5
 $as_echo_n "checking for working libsupc++... " >&6; }
@@ -4429,7 +4430,6 @@
    save_LIBS="$LIBS"
    CXX="$CC"
    LIBS="$LIBS -lsupc++"
-   LINKER="$CC"
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4445,12 +4445,12 @@
 if ac_fn_cxx_try_link "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
+       LINKER="$CC"
 else
 
          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, making everything bigger and slower" >&5
 $as_echo "no, making everything bigger and slower" >&6; }
          LIBS="$save_LIBS"
-         LINKER="$save_CXX"
 
 
 fi
@@ -4487,14 +4487,6 @@
   CFLAGS="$CXXFLAGS"
 fi
 
-case $host in
-   *-*-solaris* )
-
-$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
-
-      ;;
-esac
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing setlocale" >&5
 $as_echo_n "checking for library containing setlocale... " >&6; }
 if ${ac_cv_search_setlocale+:} false; then :
@@ -4680,7 +4672,6 @@
 support_xim=yes
 support_pixbuf=yes
 support_startup_notification=yes
-support_afterimage=yes
 support_xft=yes
 support_unicode3=no
 support_combining=yes
@@ -4713,7 +4704,6 @@
        support_xim=no
        support_pixbuf=no
        support_startup_notification=no
-       support_afterimage=no
        support_xft=no
        support_unicode3=no
        support_combining=no
@@ -4742,7 +4732,6 @@
        support_xim=yes
        support_pixbuf=yes
        support_startup_notification=yes
-       support_afterimage=yes
        support_xft=yes
        support_unicode3=yes
        support_combining=yes
@@ -4756,32 +4745,32 @@
 fi
 
 
-ASSERTIONS=no
+support_assertions=no
 # Check whether --enable-assert was given.
 if test "${enable_assert+set}" = set; then :
   enableval=$enable_assert; if test x$enableval = xyes; then
-    ASSERTIONS=yes
+    support_assertions=yes
   fi
 fi
 
-if test x$ASSERTIONS = xno; then
+if test x$support_assertions = xno; then
 
 $as_echo "#define NDEBUG 1" >>confdefs.h
 
 fi
 
-WARNINGS=no
+support_warnings=no
 # Check whether --enable-warnings was given.
 if test "${enable_warnings+set}" = set; then :
   enableval=$enable_warnings; if test x$enableval = xyes; then
-    WARNINGS=yes
+    support_warnings=yes
   fi
 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"
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -6434,7 +6423,6 @@
 
 AFTERIMAGE_CFLAGS=
 AFTERIMAGE_LIBS=
-AFTERIMAGE_VERSION=
 
 if test x$support_afterimage = xyes; then
   support_afterimage=no
@@ -6485,18 +6473,15 @@
   if test "x$afterimage_config" != "xno" ; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libAfterImage version >= 1.15" >&5
 $as_echo_n "checking for libAfterImage version >= 1.15... " >&6; }
-    xAFTERIMAGE_VERSION=`$afterimage_config --version`
-    if test -n "$xAFTERIMAGE_VERSION" ; then
-      xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
-      xAFTERIMAGE_LIBS=`$afterimage_config --libs`
-      if test "x$xAFTERIMAGE_LIBS" != "x"; then
-        libai_ver_major=`echo $xAFTERIMAGE_VERSION | cut -f 1 -d .`
-        libai_ver_minor=`echo $xAFTERIMAGE_VERSION | cut -f 2 -d .`
+    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
-          AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS"
-          AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS"
-          AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION"
         fi
       fi
     fi
@@ -6513,6 +6498,8 @@
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
+      AFTERIMAGE_CFLAGS=
+      AFTERIMAGE_LIBS=
     fi
   fi
 fi
@@ -6768,6 +6755,14 @@
 done
 
 
+case $host in
+   *-*-solaris*)
+
+$as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
+
+      ;;
+esac
+
 
 for ac_header in utmp.h
 do :
@@ -6911,18 +6906,6 @@
 fi
 
 
-ac_fn_cxx_check_member "$LINENO" "struct utmpx" "ut_session" "ac_cv_member_struct_utmpx_ut_session" "
-#include <sys/types.h>
-#include <utmpx.h>
-
-"
-if test "x$ac_cv_member_struct_utmpx_ut_session" = xyes; then :
-
-$as_echo "#define HAVE_UTMPX_SESSION 1" >>confdefs.h
-
-fi
-
-
 fi
 
 done
@@ -7056,7 +7039,7 @@
 else
 
 if test "$cross_compiling" != yes; then
-  for file in "/var/log/lastlog"; do
+  for file in "/var/log/lastlog" "/var/adm/lastlog"; do
     if test -f "$file"; then
       pt_cv_path_lastlog=$file
       break
@@ -7287,6 +7270,70 @@
 fi
 
 
+case $host in
+   *-*-solaris*)
+
+$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sendmsg" >&5
+$as_echo_n "checking for library containing sendmsg... " >&6; }
+if ${ac_cv_search_sendmsg+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sendmsg ();
+int
+main ()
+{
+return sendmsg ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' socket; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_search_sendmsg=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_sendmsg+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_sendmsg+:} false; then :
+
+else
+  ac_cv_search_sendmsg=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sendmsg" >&5
+$as_echo "$ac_cv_search_sendmsg" >&6; }
+ac_res=$ac_cv_search_sendmsg
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+      ;;
+esac
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unix-compliant filehandle passing ability" >&5
 $as_echo_n "checking for unix-compliant filehandle passing ability... " >&6; }
 if ${pt_cv_can_pass_fds+:} false; then :