--- rxvt-unicode/configure 2012/01/21 12:44:11 1.153 +++ rxvt-unicode/configure 2012/06/19 18:17:56 1.156 @@ -599,14 +599,11 @@ PERLFLAGS PERLLIB PERL +PIXBUF_LIBS +PIXBUF_CFLAGS XFT_CONFIG -AFTERIMAGE_LIBS -AFTERIMAGE_CFLAGS -afterimage_config STARTUP_NOTIFICATION_LIBS STARTUP_NOTIFICATION_CFLAGS -PIXBUF_LIBS -PIXBUF_CFLAGS PKG_CONFIG X_EXTRA_LIBS X_LIBS @@ -692,8 +689,6 @@ enable_combining enable_xft enable_font_styles -enable_afterimage -with_afterimage_config enable_pixbuf enable_startup_notification enable_transparency @@ -724,6 +719,7 @@ enable_pointer_blank with_term with_terminfo +enable_xdbe with_x enable_utmp enable_wtmp @@ -1369,7 +1365,6 @@ --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 (deprecated) --enable-pixbuf enable integration with gdk-pixbuf for background images --enable-startup-notification enable freedesktop startup notification support --enable-transparency enable transparent backgrounds @@ -1394,6 +1389,7 @@ --enable-smart-resize enable smart growth/shrink behaviour --enable-text-blink enable blinking text --enable-pointer-blank enable pointer blanking when typing or inactive + --enable-xdbe enable support for double buffering --enable-utmp enable utmp (utmpx) support --enable-wtmp enable wtmp (wtmpx) support (requires --enable-utmp) --enable-lastlog enable lastlog support (requires --enable-utmp) @@ -1401,7 +1397,6 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-afterimage-config=DIR use libAfterImage config script in DIR --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all) --with-res-name=NAME use this as default resource name (default: urxvt) --with-res-class=CLASS use this as the resource class (default: URxvt) @@ -4671,6 +4666,7 @@ support_iso14755=yes support_styles=yes support_perl=yes +support_xdbe=yes codesets=all @@ -4679,6 +4675,7 @@ enableval=$enable_everything; if test x$enableval = xno; then support_frills=no + support_xdbe=no support_inheritpixmap=no support_fading=no support_keepscrolling=no @@ -4703,6 +4700,7 @@ support_iso14755=no support_styles=no support_perl=no + support_xdbe=no codesets= fi if test x$enableval = xyes; then @@ -4731,6 +4729,7 @@ support_iso14755=yes support_styles=yes support_perl=yes + support_xdbe=yes codesets=all fi @@ -4831,23 +4830,6 @@ fi -# Check whether --enable-afterimage was given. -if test "${enable_afterimage+set}" = set; then : - enableval=$enable_afterimage; if test x$enableval = xyes -o x$enableval = xno; then - support_afterimage=$enableval - fi -fi - - - -# Check whether --with-afterimage_config was given. -if test "${with_afterimage_config+set}" = set; then : - withval=$with_afterimage_config; if test "x$withval" != x; then - afterimage_config=$withval/afterimage-config - fi -fi - - # Check whether --enable-pixbuf was given. if test "${enable_pixbuf+set}" = set; then : enableval=$enable_pixbuf; if test x$enableval = xyes -o x$enableval = xno; then @@ -5135,6 +5117,14 @@ fi +# Check whether --enable-xdbe was given. +if test "${enable_xdbe+set}" = set; then : + enableval=$enable_xdbe; if test x$enableval = xyes -o x$enableval = xno; then + support_xdbe=$enableval + fi +fi + + LIBEV_M4_AVOID_LIBRT=1 @@ -6268,82 +6258,6 @@ fi -image_lib=none - -PIXBUF_CFLAGS= -PIXBUF_LIBS= - -if test x$support_pixbuf = xyes; then - support_pixbuf=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 gdk-pixbuf" >&5 -$as_echo_n "checking for gdk-pixbuf... " >&6; } - if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then - PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`" - PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`" - support_pixbuf=yes - fi - - if test x$support_pixbuf = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } - image_lib=gdk-pixbuf - support_afterimage=no - -$as_echo "#define HAVE_PIXBUF 1" >>confdefs.h - - -$as_echo "#define BG_IMAGE_FROM_FILE 1" >>confdefs.h - - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi -fi - - - - STARTUP_NOTIFICATION_CFLAGS= STARTUP_NOTIFICATION_LIBS= @@ -6413,92 +6327,6 @@ -AFTERIMAGE_CFLAGS= -AFTERIMAGE_LIBS= - -if test x$support_afterimage = xyes; then - support_afterimage=no - - if test "x$afterimage_config" = "x" ; then - # Extract the first word of "afterimage-config", so it can be a program name with args. -set dummy afterimage-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_afterimage_config+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $afterimage_config in - [\\/]* | ?:[\\/]*) - ac_cv_path_afterimage_config="$afterimage_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_afterimage_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_afterimage_config" && ac_cv_path_afterimage_config="no" - ;; -esac -fi -afterimage_config=$ac_cv_path_afterimage_config -if test -n "$afterimage_config"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $afterimage_config" >&5 -$as_echo "$afterimage_config" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi - 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; } - 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 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AFTERIMAGE_LIBS" >&5 -$as_echo "$AFTERIMAGE_LIBS" >&6; } - image_lib=libafterimage - -$as_echo "#define HAVE_AFTERIMAGE 1" >>confdefs.h - - -$as_echo "#define BG_IMAGE_FROM_FILE 1" >>confdefs.h - - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - AFTERIMAGE_CFLAGS= - AFTERIMAGE_LIBS= - fi - fi -fi - - - - for ac_header in \ sys/byteorder.h \ sys/ioctl.h \ @@ -7541,7 +7369,15 @@ fi -if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then +support_image=no +if test x$support_inheritpixmap = xyes || test x$support_pixbuf = xyes; then + support_image=yes +fi +if test x$support_xdbe = xyes; then + LIBS="$LIBS -lXext" +fi + +if test x$support_xft = xyes || test x$support_image = xyes; then rxvt_have_xrender=no # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 @@ -7830,6 +7666,100 @@ fi fi + +image_lib=none + +PIXBUF_CFLAGS= +PIXBUF_LIBS= + +if test x$support_image = xyes && test x$rxvt_have_xrender = xyes; then + LIBS="$LIBS -lm" + +$as_echo "#define XRENDER 1" >>confdefs.h + + + if test x$support_inheritpixmap = xyes; then + +$as_echo "#define ENABLE_TRANSPARENCY 1" >>confdefs.h + + fi + + if test x$support_pixbuf = xyes; then + support_pixbuf=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 gdk-pixbuf" >&5 +$as_echo_n "checking for gdk-pixbuf... " >&6; } + if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then + PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`" + PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`" + support_pixbuf=yes + fi + + if test x$support_pixbuf = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } + image_lib=gdk-pixbuf + +$as_echo "#define HAVE_PIXBUF 1" >>confdefs.h + + +$as_echo "#define BG_IMAGE_FROM_FILE 1" >>confdefs.h + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + fi +fi + + + + +if test x$support_xdbe = xyes; then + +$as_echo "#define ENABLE_XDBE 1" >>confdefs.h + +fi if test x$support_styles = xyes; then $as_echo "#define ENABLE_STYLES 1" >>confdefs.h @@ -7850,17 +7780,6 @@ $as_echo "#define OFF_FOCUS_FADING 1" >>confdefs.h fi -if test x$support_inheritpixmap = xyes; then - if test x$rxvt_have_xrender = xyes; then - LIBS="$LIBS -lm" - -$as_echo "#define XRENDER 1" >>confdefs.h - - fi - -$as_echo "#define ENABLE_TRANSPARENCY 1" >>confdefs.h - -fi if test x$support_keepscrolling = xno; then $as_echo "#define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1" >>confdefs.h @@ -7988,46 +7907,7 @@ done IFS=$as_save_IFS - ;; -esac -fi -PERL=$ac_cv_path_PERL -if test -n "$PERL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 -$as_echo "$PERL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - # Extract the first word of "perl", so it can be a program name with args. -set dummy perl; 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_PERL+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $PERL in - [\\/]* | ?:[\\/]*) - ac_cv_path_PERL="$PERL" # 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_PERL="$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_PERL" && ac_cv_path_PERL="perl" ;; esac fi