--- rxvt-unicode/configure 2011/06/22 15:18:05 1.146 +++ rxvt-unicode/configure 2011/11/16 20:22:12 1.148 @@ -603,6 +603,8 @@ AFTERIMAGE_LIBS AFTERIMAGE_CFLAGS afterimage_config +STARTUP_NOTIFICATION_LIBS +STARTUP_NOTIFICATION_CFLAGS PIXBUF_LIBS PIXBUF_CFLAGS PKG_CONFIG @@ -693,6 +695,7 @@ enable_afterimage with_afterimage_config enable_pixbuf +enable_startup_notification enable_transparency enable_fading enable_rxvt_scroll @@ -1368,6 +1371,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 @@ -4667,6 +4671,7 @@ support_scroll_xterm=yes support_xim=yes support_pixbuf=yes +support_startup_notification=yes support_afterimage=yes support_xft=yes support_unicode3=no @@ -4699,6 +4704,7 @@ support_wtmp=no support_xim=no support_pixbuf=no + support_startup_notification=no support_afterimage=no support_xft=no support_unicode3=no @@ -4727,6 +4733,7 @@ support_wtmp=yes support_xim=yes support_pixbuf=yes + support_startup_notification=yes support_afterimage=yes support_xft=yes support_unicode3=yes @@ -4860,6 +4867,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 @@ -6340,6 +6355,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 test "${ac_cv_path_PKG_CONFIG+set}" = set; 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= @@ -6892,7 +6976,7 @@ int main() { - char **path, *list[] = { "/var/run/utmp", "/var/adm/utmp", "/etc/utmp", "/usr/etc/utmp", "/usr/adm/utmp", NULL }; + 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 @@ -6954,7 +7038,7 @@ int main() { - char **path, *list[] = { "/var/log/wtmp", "/var/adm/wtmp", "/etc/wtmp", "/usr/etc/wtmp", "/usr/adm/wtmp", NULL }; + 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 @@ -7014,7 +7098,7 @@ int main() { - char **path, *list[] = { "/var/log/wtmpx", "/var/adm/wtmpx", NULL }; + const char **path, *list[] = { "/var/log/wtmpx", "/var/adm/wtmpx", NULL }; FILE *f = fopen("conftestval", "w"); if (!f) return 1; #ifdef WTMPX_FILE @@ -7078,7 +7162,7 @@ int main() { - char **path, *list[] = { "/var/log/lastlog", NULL }; + const char **path, *list[] = { "/var/log/lastlog", NULL }; FILE *f = fopen("conftestval", "w"); if (!f) return 1; #ifdef LASTLOG_FILE @@ -7138,7 +7222,7 @@ int main() { - char **path, *list[] = { "/var/log/lastlogx", "/var/adm/lastlogx", NULL }; + const char **path, *list[] = { "/var/log/lastlogx", "/var/adm/lastlogx", NULL }; FILE *f = fopen("conftestval", "w"); if (!f) return 1; #ifdef LASTLOGX_FILE @@ -7468,50 +7552,6 @@ 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_n "checking for UNIX98 ptys... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7538,7 +7578,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