ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/configure.ac
(Generate patch)

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.118 by sf-exg, Wed Oct 13 23:04:56 2010 UTC vs.
Revision 1.125 by sf-exg, Tue Jan 4 10:01:53 2011 UTC

… …
93support_pointer_blank=yes 93support_pointer_blank=yes
94support_scroll_rxvt=yes 94support_scroll_rxvt=yes
95support_scroll_next=yes 95support_scroll_next=yes
96support_scroll_xterm=yes 96support_scroll_xterm=yes
97support_xim=yes 97support_xim=yes
98support_pixbuf=yes
98support_afterimage=yes 99support_afterimage=yes
99support_xft=yes 100support_xft=yes
100support_unicode3=no 101support_unicode3=no
101support_combining=yes 102support_combining=yes
102support_8bitctrls=no 103support_8bitctrls=no
… …
128 support_scroll_next=no 129 support_scroll_next=no
129 support_scroll_xterm=no 130 support_scroll_xterm=no
130 support_utmp=no 131 support_utmp=no
131 support_wtmp=no 132 support_wtmp=no
132 support_xim=no 133 support_xim=no
134 support_pixbuf=no
133 support_afterimage=no 135 support_afterimage=no
134 support_xft=no 136 support_xft=no
135 support_unicode3=no 137 support_unicode3=no
136 support_combining=no 138 support_combining=no
137 support_8bitctrls=no 139 support_8bitctrls=no
… …
155 support_scroll_next=yes 157 support_scroll_next=yes
156 support_scroll_xterm=yes 158 support_scroll_xterm=yes
157 support_utmp=yes 159 support_utmp=yes
158 support_wtmp=yes 160 support_wtmp=yes
159 support_xim=yes 161 support_xim=yes
162 support_pixbuf=yes
160 support_afterimage=yes 163 support_afterimage=yes
161 support_xft=yes 164 support_xft=yes
162 support_unicode3=yes 165 support_unicode3=yes
163 support_combining=yes 166 support_combining=yes
164 #support_8bitctrls=yes 167 #support_8bitctrls=yes
… …
431 434
432AC_PATH_PROG(TIC, tic, :) 435AC_PATH_PROG(TIC, tic, :)
433 436
434AC_PATH_XTRA 437AC_PATH_XTRA
435 438
439image_lib=none
440
436PIXBUF_CFLAGS= 441PIXBUF_CFLAGS=
437PIXBUF_LIBS= 442PIXBUF_LIBS=
438 443
439if test x$support_pixbuf = xyes; then 444if test x$support_pixbuf = xyes; then
440 support_pixbuf=no 445 support_pixbuf=no
441 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 446 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
442 AC_MSG_CHECKING(for gdk-pixbuf) 447 AC_MSG_CHECKING(for gdk-pixbuf)
443 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-xlib-2.0; then 448 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then
444 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --cflags`" 449 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
445 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --libs`" 450 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
446 support_pixbuf=yes 451 support_pixbuf=yes
447 fi 452 fi
448 453
449 if test x$support_pixbuf = xyes; then 454 if test x$support_pixbuf = xyes; then
450 AC_MSG_RESULT(ok) 455 AC_MSG_RESULT(ok)
456 image_lib=gdk-pixbuf
451 support_afterimage=no 457 support_afterimage=no
452 AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing) 458 AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing)
453 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.) 459 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
454 else 460 else
455 AC_MSG_RESULT(no) 461 AC_MSG_RESULT(no)
… …
486 fi 492 fi
487 fi 493 fi
488 fi 494 fi
489 if test "x$support_afterimage" = "xyes"; then 495 if test "x$support_afterimage" = "xyes"; then
490 AC_MSG_RESULT($AFTERIMAGE_LIBS) 496 AC_MSG_RESULT($AFTERIMAGE_LIBS)
497 image_lib=libafterimage
491 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing) 498 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
492 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.) 499 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
493 else 500 else
494 AC_MSG_RESULT(no) 501 AC_MSG_RESULT(no)
495 fi 502 fi
… …
622TTY_GROUP_CHECK 629TTY_GROUP_CHECK
623 630
624dnl# -------------------------------------------------------------------------- 631dnl# --------------------------------------------------------------------------
625dnl# now add and remove other stuff 632dnl# now add and remove other stuff
626dnl# -------------------------------------------------------------------------- 633dnl# --------------------------------------------------------------------------
627if test x$support_xft = xyes; then 634if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then
635 rxvt_have_xrender=no
636 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
637 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
638 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS"
639 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
640 rxvt_have_xrender=yes
641
642 save_LIBS="$LIBS"
643 LIBS="$LIBS $X_LIBS"
644 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no])
645 AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no])
646 LIBS="$save_LIBS"
647 fi
648fi
649
650if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then
628 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 651 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
629 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 652 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
630 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 653 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
631 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 654 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
632 else 655 else
… …
635 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 658 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
636 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 659 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
637 fi 660 fi
638 fi 661 fi
639 662
663 if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then
664 X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS"
665 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
666 fi
667
640 save_LIBS="$LIBS" 668 save_LIBS="$LIBS"
641 LIBS="$LIBS $X_LIBS" 669 LIBS="$LIBS $X_LIBS"
642 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 670 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
643 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no]) 671 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
672 AC_CHECK_HEADERS(fontconfig/fontconfig.h,,[support_xft=no])
673 AC_CHECK_LIB(fontconfig,FcPatternGet,:,[support_xft=no])
644 LIBS="$save_LIBS" 674 LIBS="$save_LIBS"
645 675
646 if test x$support_xft = xyes; then 676 if test x$support_xft = xyes; then
647 AC_DEFINE(XFT, 1, Define to enable xft support) 677 AC_DEFINE(XFT, 1, Define to enable xft support)
648 fi 678 fi
… …
658fi 688fi
659if test x$support_fading = xyes; then 689if test x$support_fading = xyes; then
660 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) 690 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
661fi 691fi
662if test x$support_inheritpixmap = xyes; then 692if test x$support_inheritpixmap = xyes; then
693 if test x$rxvt_have_xrender = xyes; then
694 LIBS="$LIBS -lm"
695 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
696 fi
663 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background) 697 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
664 test x$support_xft = xyes && LIBS="$LIBS -lm"
665fi 698fi
666if test x$support_keepscrolling = xno; then 699if test x$support_keepscrolling = xno; then
667 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) 700 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
668fi 701fi
669if test x$support_selectionscrolling = xyes; then 702if test x$support_selectionscrolling = xyes; then
… …
792if test x$RESFALLBACK != x; then 825if test x$RESFALLBACK != x; then
793 echo " resource class fallback: $RESFALLBACK" 826 echo " resource class fallback: $RESFALLBACK"
794fi 827fi
795echo 828echo
796echo " embedded perl: $support_perl" 829echo " embedded perl: $support_perl"
797echo " libafterimage: $support_afterimage" 830echo " image library: $image_lib"
798echo 831echo
799if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then 832if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then
800 echo ".----------------------------------------------------------------." 833 echo ".----------------------------------------------------------------."
801 echo ". WARNING: --enable-xim was specified however the locale support ." 834 echo ". WARNING: --enable-xim was specified however the locale support ."
802 echo ". functions could not be found. ." 835 echo ". functions could not be found. ."

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines