--- rxvt-unicode/configure	2011/11/16 20:22:12	1.148
+++ rxvt-unicode/configure	2011/12/18 02:23:11	1.150
@@ -1369,7 +1369,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
@@ -4672,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
@@ -4705,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
@@ -4734,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
@@ -4748,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.  */
 
@@ -6426,7 +6423,6 @@
 
 AFTERIMAGE_CFLAGS=
 AFTERIMAGE_LIBS=
-AFTERIMAGE_VERSION=
 
 if test x$support_afterimage = xyes; then
   support_afterimage=no
@@ -6477,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
@@ -6505,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
@@ -6956,309 +6951,145 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where utmp is located" >&5
-$as_echo_n "checking where utmp is located... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a fallback location of utmp" >&5
+$as_echo_n "checking for a fallback location of utmp... " >&6; }
 if test "${pt_cv_path_utmp+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define UTMP_FILE in config.h manually" >&5
-$as_echo "$as_me: WARNING: Define UTMP_FILE in config.h manually" >&2;}
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
 
-#include <sys/types.h>
-#include <utmp.h>
-
-int main()
-{
-    const char **path, *list[] = { "/var/run/utmp", "/var/adm/utmp", "/etc/utmp", "/usr/etc/utmp", "/usr/adm/utmp", NULL };
-    FILE *f = fopen("conftestval", "w");
-    if (!f) return 1;
-#ifdef UTMP_FILE
-    fprintf(f, "%s\n", UTMP_FILE);
-#elif defined(_PATH_UTMP)
-    fprintf(f, "%s\n", _PATH_UTMP);
-#else
-    for (path = list; *path; path++) {
-        struct stat st;
-        if (stat(*path, &st) == 0) {
-            fprintf(f, "%s\n", *path);
-            break;
-        }
-    }
-#endif
-    return fclose(f) != 0;
-}
-_ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
-  pt_cv_path_utmp=`cat conftestval`
-else
-  pt_cv_path_utmp=
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+if test "$cross_compiling" != yes; then
+  for file in "/var/run/utmp" "/var/adm/utmp" "/etc/utmp" "/usr/etc/utmp" "/usr/adm/utmp"; do
+    if test -f "$file"; then
+      pt_cv_path_utmp=$file
+      break
+    fi
+  done
 fi
-
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_path_utmp" >&5
 $as_echo "$pt_cv_path_utmp" >&6; }
 if test x$pt_cv_path_utmp != x; then
 
 cat >>confdefs.h <<_ACEOF
-#define UTMP_FILE "$pt_cv_path_utmp"
+#define PT_UTMP_FILE "$pt_cv_path_utmp"
 _ACEOF
 
+elif test "$cross_compiling" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define PT_UTMP_FILE in config.h manually" >&5
+$as_echo "$as_me: WARNING: Define PT_UTMP_FILE in config.h manually" >&2;}
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where wtmp is located" >&5
-$as_echo_n "checking where wtmp is located... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a fallback location of wtmp" >&5
+$as_echo_n "checking for a fallback location of wtmp... " >&6; }
 if test "${pt_cv_path_wtmp+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define WTMP_FILE in config.h manually" >&5
-$as_echo "$as_me: WARNING: Define WTMP_FILE in config.h manually" >&2;}
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-
-#include <sys/types.h>
-#ifdef HAVE_UTMP_H
-#include <utmp.h>
-#endif
 
-int main()
-{
-    const char **path, *list[] = { "/var/log/wtmp", "/var/adm/wtmp", "/etc/wtmp", "/usr/etc/wtmp", "/usr/adm/wtmp", NULL };
-    FILE *f = fopen("conftestval", "w");
-    if (!f) return 1;
-#ifdef WTMP_FILE
-    fprintf(f, "%s\n", WTMP_FILE);
-#elif defined(_PATH_WTMP)
-    fprintf(f, "%s\n", _PATH_WTMP);
-#else
-    for (path = list; *path; path++) {
-        struct stat st;
-        if (stat(*path, &st) == 0) {
-            fprintf(f, "%s\n", *path);
-            break;
-        }
-    }
-#endif
-    return fclose(f) != 0;
-}
-_ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
-  pt_cv_path_wtmp=`cat conftestval`
-else
-  pt_cv_path_wtmp=
+if test "$cross_compiling" != yes; then
+  for file in "/var/log/wtmp" "/var/adm/wtmp" "/etc/wtmp" "/usr/etc/wtmp" "/usr/adm/wtmp"; do
+    if test -f "$file"; then
+      pt_cv_path_wtmp=$file
+      break
+    fi
+  done
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_path_wtmp" >&5
 $as_echo "$pt_cv_path_wtmp" >&6; }
 if test x$pt_cv_path_wtmp != x; then
 
 cat >>confdefs.h <<_ACEOF
-#define WTMP_FILE "$pt_cv_path_wtmp"
+#define PT_WTMP_FILE "$pt_cv_path_wtmp"
 _ACEOF
 
+elif test "$cross_compiling" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define PT_WTMP_FILE in config.h manually" >&5
+$as_echo "$as_me: WARNING: Define PT_WTMP_FILE in config.h manually" >&2;}
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where wtmpx is located" >&5
-$as_echo_n "checking where wtmpx is located... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a fallback location of wtmpx" >&5
+$as_echo_n "checking for a fallback location of wtmpx... " >&6; }
 if test "${pt_cv_path_wtmpx+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define WTMPX_FILE in config.h manually" >&5
-$as_echo "$as_me: WARNING: Define WTMPX_FILE in config.h manually" >&2;}
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
 
-#ifdef HAVE_UTMPX_H
-#include <utmpx.h>
-#endif
-
-int main()
-{
-    const char **path, *list[] = { "/var/log/wtmpx", "/var/adm/wtmpx", NULL };
-    FILE *f = fopen("conftestval", "w");
-    if (!f) return 1;
-#ifdef WTMPX_FILE
-    fprintf(f, "%s\n", WTMPX_FILE);
-#elif defined(_PATH_WTMPX)
-    fprintf(f, "%s\n", _PATH_WTMPX);
-#else
-    for (path = list; *path; path++) {
-        struct stat st;
-        if (stat(*path, &st) == 0) {
-            fprintf(f, "%s\n", *path);
-            break;
-        }
-    }
-#endif
-    return fclose(f) != 0;
-}
-_ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
-  pt_cv_path_wtmpx=`cat conftestval`
-else
-  pt_cv_path_wtmpx=
+if test "$cross_compiling" != yes; then
+  for file in "/var/log/wtmpx" "/var/adm/wtmpx"; do
+    if test -f "$file"; then
+      pt_cv_path_wtmpx=$file
+      break
+    fi
+  done
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_path_wtmpx" >&5
 $as_echo "$pt_cv_path_wtmpx" >&6; }
 if test x$pt_cv_path_wtmpx != x; then
 
 cat >>confdefs.h <<_ACEOF
-#define WTMPX_FILE "$pt_cv_path_wtmpx"
+#define PT_WTMPX_FILE "$pt_cv_path_wtmpx"
 _ACEOF
 
+elif test "$cross_compiling" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define PT_WTMPX_FILE in config.h manually" >&5
+$as_echo "$as_me: WARNING: Define PT_WTMPX_FILE in config.h manually" >&2;}
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where lastlog is located" >&5
-$as_echo_n "checking where lastlog is located... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a fallback location of lastlog" >&5
+$as_echo_n "checking for a fallback location of lastlog... " >&6; }
 if test "${pt_cv_path_lastlog+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define LASTLOG_FILE in config.h manually" >&5
-$as_echo "$as_me: WARNING: Define LASTLOG_FILE in config.h manually" >&2;}
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
 
-#include <sys/types.h>
-#ifdef HAVE_UTMP_H
-#include <utmp.h>
-#endif
-#ifdef HAVE_LASTLOG_H
-#include <lastlog.h>
-#endif
-
-int main()
-{
-    const char **path, *list[] = { "/var/log/lastlog", NULL };
-    FILE *f = fopen("conftestval", "w");
-    if (!f) return 1;
-#ifdef LASTLOG_FILE
-    fprintf(f, "%s\n", LASTLOG_FILE);
-#elif defined(_PATH_LASTLOG)
-    fprintf(f, "%s\n", _PATH_LASTLOG);
-#else
-    for (path = list; *path; path++) {
-        struct stat st;
-        if (stat(*path, &st) == 0) {
-            fprintf(f, "%s\n", *path);
-            break;
-        }
-    }
-#endif
-    return fclose(f) != 0;
-}
-_ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
-  pt_cv_path_lastlog=`cat conftestval`
-else
-  pt_cv_path_lastlog=
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+if test "$cross_compiling" != yes; then
+  for file in "/var/log/lastlog"; do
+    if test -f "$file"; then
+      pt_cv_path_lastlog=$file
+      break
+    fi
+  done
 fi
-
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_path_lastlog" >&5
 $as_echo "$pt_cv_path_lastlog" >&6; }
 if test x$pt_cv_path_lastlog != x; then
 
 cat >>confdefs.h <<_ACEOF
-#define LASTLOG_FILE "$pt_cv_path_lastlog"
+#define PT_LASTLOG_FILE "$pt_cv_path_lastlog"
 _ACEOF
 
+elif test "$cross_compiling" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define PT_LASTLOG_FILE in config.h manually" >&5
+$as_echo "$as_me: WARNING: Define PT_LASTLOG_FILE in config.h manually" >&2;}
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where lastlogx is located" >&5
-$as_echo_n "checking where lastlogx is located... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a fallback location of lastlogx" >&5
+$as_echo_n "checking for a fallback location of lastlogx... " >&6; }
 if test "${pt_cv_path_lastlogx+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define LASTLOGX_FILE in config.h manually" >&5
-$as_echo "$as_me: WARNING: Define LASTLOGX_FILE in config.h manually" >&2;}
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
 
-#ifdef HAVE_UTMPX_H
-#include <utmpx.h>
-#endif
-
-int main()
-{
-    const char **path, *list[] = { "/var/log/lastlogx", "/var/adm/lastlogx", NULL };
-    FILE *f = fopen("conftestval", "w");
-    if (!f) return 1;
-#ifdef LASTLOGX_FILE
-    fprintf(f, "%s\n", LASTLOGX_FILE);
-#elif defined(_PATH_LASTLOGX)
-    fprintf(f, "%s\n", _PATH_LASTLOGX);
-#else
-    for (path = list; *path; path++) {
-        struct stat st;
-        if (stat(*path, &st) == 0) {
-            fprintf(f, "%s\n", *path);
-            break;
-        }
-    }
-#endif
-    return fclose(f) != 0;
-}
-_ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
-  pt_cv_path_lastlogx=`cat conftestval`
-else
-  pt_cv_path_lastlogx=
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+if test "$cross_compiling" != yes; then
+  for file in "/var/log/lastlogx" "/var/adm/lastlogx"; do
+    if test -f "$file"; then
+      pt_cv_path_lastlogx=$file
+      break
+    fi
+  done
 fi
-
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_path_lastlogx" >&5
 $as_echo "$pt_cv_path_lastlogx" >&6; }
 if test x$pt_cv_path_lastlogx != x; then
 
 cat >>confdefs.h <<_ACEOF
-#define LASTLOGX_FILE "$pt_cv_path_lastlogx"
+#define PT_LASTLOGX_FILE "$pt_cv_path_lastlogx"
 _ACEOF
 
+elif test "$cross_compiling" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define PT_LASTLOGX_FILE in config.h manually" >&5
+$as_echo "$as_me: WARNING: Define PT_LASTLOGX_FILE in config.h manually" >&2;}
 fi
 
 
@@ -7552,9 +7383,9 @@
 done
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNIX98 ptys" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNIX98 ptys" >&5
 $as_echo_n "checking for UNIX98 ptys... " >&6; }
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 int
@@ -7570,7 +7401,7 @@
 
 $as_echo "#define UNIX98_PTY 1" >>confdefs.h
 
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5