--- rxvt-unicode/configure	2011/06/01 10:53:07	1.145
+++ rxvt-unicode/configure	2011/11/27 15:18:44	1.149
@@ -611,6 +611,8 @@
 AFTERIMAGE_LIBS
 AFTERIMAGE_CFLAGS
 afterimage_config
+STARTUP_NOTIFICATION_LIBS
+STARTUP_NOTIFICATION_CFLAGS
 PIXBUF_LIBS
 PIXBUF_CFLAGS
 PKG_CONFIG
@@ -701,6 +703,7 @@
 enable_afterimage
 with_afterimage_config
 enable_pixbuf
+enable_startup_notification
 enable_transparency
 enable_fading
 enable_rxvt_scroll
@@ -1376,6 +1379,7 @@
   --enable-font-styles    enable bold and italic support
   --enable-afterimage     enable integration with libAfterImage for background images
   --enable-pixbuf         enable integration with gdk-pixbuf for background images
+  --enable-startup-notification  enable freedesktop startup notification support
   --enable-transparency   enable transparent backgrounds
   --enable-fading         enable colors fading when off focus
   --enable-rxvt-scroll    enable rxvt style scrollbar
@@ -4675,6 +4679,7 @@
 support_scroll_xterm=yes
 support_xim=yes
 support_pixbuf=yes
+support_startup_notification=yes
 support_afterimage=yes
 support_xft=yes
 support_unicode3=no
@@ -4707,6 +4712,7 @@
        support_wtmp=no
        support_xim=no
        support_pixbuf=no
+       support_startup_notification=no
        support_afterimage=no
        support_xft=no
        support_unicode3=no
@@ -4735,6 +4741,7 @@
        support_wtmp=yes
        support_xim=yes
        support_pixbuf=yes
+       support_startup_notification=yes
        support_afterimage=yes
        support_xft=yes
        support_unicode3=yes
@@ -4868,6 +4875,14 @@
 fi
 
 
+# Check whether --enable-startup-notification was given.
+if test "${enable_startup_notification+set}" = set; then :
+  enableval=$enable_startup_notification; if test x$enableval = xyes -o x$enableval = xno; then
+    support_startup_notification=$enableval
+  fi
+fi
+
+
 # Check whether --enable-transparency was given.
 if test "${enable_transparency+set}" = set; then :
   enableval=$enable_transparency; if test x$enableval = xyes -o x$enableval = xno; then
@@ -6348,6 +6363,75 @@
 
 
 
+STARTUP_NOTIFICATION_CFLAGS=
+STARTUP_NOTIFICATION_LIBS=
+
+if test x$support_startup_notification = xyes; then
+  support_startup_notification=no
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libstartup-notification" >&5
+$as_echo_n "checking for libstartup-notification... " >&6; }
+  if test $PKG_CONFIG != no && $PKG_CONFIG --exists libstartup-notification-1.0; then
+    STARTUP_NOTIFICATION_CFLAGS="`$PKG_CONFIG libstartup-notification-1.0 --cflags`"
+    STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG libstartup-notification-1.0 --libs`"
+    support_startup_notification=yes
+  fi
+
+  if test x$support_startup_notification = xyes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+
+$as_echo "#define HAVE_STARTUP_NOTIFICATION 1" >>confdefs.h
+
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  fi
+fi
+
+
+
+
 AFTERIMAGE_CFLAGS=
 AFTERIMAGE_LIBS=
 AFTERIMAGE_VERSION=
@@ -6880,309 +6964,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 ${pt_cv_path_utmp+:} false; 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()
-{
-    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 ${pt_cv_path_wtmp+:} false; 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()
-{
-    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 ${pt_cv_path_wtmpx+:} false; 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()
-{
-    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=
-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/wtmpx" "/var/adm/wtmpx"; do
+    if test -f "$file"; then
+      pt_cv_path_wtmpx=$file
+      break
+    fi
+  done
 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 ${pt_cv_path_lastlog+:} false; 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()
-{
-    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 ${pt_cv_path_lastlogx+:} false; 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()
-{
-    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
 
 
@@ -7476,53 +7396,9 @@
 done
 
 
-have_clone=no
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptc" >&5
-$as_echo_n "checking for /dev/ptc... " >&6; }
-if test -e /dev/ptc; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define CLONE_DEVICE \"/dev/ptc\"" >>confdefs.h
-
-  have_clone=yes
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-case $host in
-  *-*-cygwin*)
-    have_clone=yes
-
-$as_echo "#define CLONE_DEVICE \"/dev/ptmx\"" >>confdefs.h
-
-    ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptmx" >&5
-$as_echo_n "checking for /dev/ptmx... " >&6; }
-    if test -e /dev/ptmx; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_DEV_PTMX 1" >>confdefs.h
-
-
-$as_echo "#define CLONE_DEVICE \"/dev/ptmx\"" >>confdefs.h
-
-      have_clone=yes
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-    ;;
-esac
-
-if test x$ac_cv_func_getpt = xyes -o x$ac_cv_func_posix_openpt = xyes -o x$have_clone = xyes; then
-  { $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
@@ -7538,7 +7414,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
@@ -7546,7 +7422,6 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-fi
 
 if test -z "$unix98_pty"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing openpty" >&5