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.119 by sf-exg, Thu Oct 14 22:08:45 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
… …
440 443
441if test x$support_pixbuf = xyes; then 444if test x$support_pixbuf = xyes; then
442 support_pixbuf=no 445 support_pixbuf=no
443 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 446 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
444 AC_MSG_CHECKING(for gdk-pixbuf) 447 AC_MSG_CHECKING(for gdk-pixbuf)
445 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
446 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --cflags`" 449 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
447 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --libs`" 450 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
448 support_pixbuf=yes 451 support_pixbuf=yes
449 fi 452 fi
450 453
451 if test x$support_pixbuf = xyes; then 454 if test x$support_pixbuf = xyes; then
452 AC_MSG_RESULT(ok) 455 AC_MSG_RESULT(ok)
… …
626TTY_GROUP_CHECK 629TTY_GROUP_CHECK
627 630
628dnl# -------------------------------------------------------------------------- 631dnl# --------------------------------------------------------------------------
629dnl# now add and remove other stuff 632dnl# now add and remove other stuff
630dnl# -------------------------------------------------------------------------- 633dnl# --------------------------------------------------------------------------
631if 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
632 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 651 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
633 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 652 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
634 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 653 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
635 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 654 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
636 else 655 else
… …
639 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 658 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
640 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 659 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
641 fi 660 fi
642 fi 661 fi
643 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
644 save_LIBS="$LIBS" 668 save_LIBS="$LIBS"
645 LIBS="$LIBS $X_LIBS" 669 LIBS="$LIBS $X_LIBS"
646 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 670 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
647 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])
648 LIBS="$save_LIBS" 674 LIBS="$save_LIBS"
649 675
650 if test x$support_xft = xyes; then 676 if test x$support_xft = xyes; then
651 AC_DEFINE(XFT, 1, Define to enable xft support) 677 AC_DEFINE(XFT, 1, Define to enable xft support)
652 fi 678 fi
… …
662fi 688fi
663if test x$support_fading = xyes; then 689if test x$support_fading = xyes; then
664 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)
665fi 691fi
666if 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
667 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)
668 test x$support_xft = xyes && LIBS="$LIBS -lm"
669fi 698fi
670if test x$support_keepscrolling = xno; then 699if test x$support_keepscrolling = xno; then
671 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)
672fi 701fi
673if test x$support_selectionscrolling = xyes; then 702if test x$support_selectionscrolling = xyes; then

Diff Legend

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