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.120 by sf-exg, Sun Oct 31 08:28:01 2010 UTC vs.
Revision 1.121 by sf-exg, Mon Nov 29 12:33:21 2010 UTC

… …
626TTY_GROUP_CHECK 626TTY_GROUP_CHECK
627 627
628dnl# -------------------------------------------------------------------------- 628dnl# --------------------------------------------------------------------------
629dnl# now add and remove other stuff 629dnl# now add and remove other stuff
630dnl# -------------------------------------------------------------------------- 630dnl# --------------------------------------------------------------------------
631if test x$support_xft = xyes; then 631if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then
632 rxvt_have_xrender=no
633 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
634 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
635 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS"
636 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
637 rxvt_have_xrender=yes
638
639 save_LIBS="$LIBS"
640 LIBS="$LIBS $X_LIBS"
641 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no])
642 AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no])
643 LIBS="$save_LIBS"
644 fi
645fi
646
647if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then
632 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 648 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
633 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 649 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
634 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 650 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
635 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 651 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
636 else 652 else
… …
639 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 655 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
640 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 656 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
641 fi 657 fi
642 fi 658 fi
643 659
660 if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then
661 X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS"
662 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
663 fi
664
644 save_LIBS="$LIBS" 665 save_LIBS="$LIBS"
645 LIBS="$LIBS $X_LIBS" 666 LIBS="$LIBS $X_LIBS"
646 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 667 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
647 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no]) 668 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
669 AC_CHECK_HEADERS(fontconfig/fontconfig.h,,[support_xft=no])
670 AC_CHECK_LIB(fontconfig,FcPatternGet,:,[support_xft=no])
648 LIBS="$save_LIBS" 671 LIBS="$save_LIBS"
649 672
650 if test x$support_xft = xyes; then 673 if test x$support_xft = xyes; then
651 AC_DEFINE(XFT, 1, Define to enable xft support) 674 AC_DEFINE(XFT, 1, Define to enable xft support)
652 fi 675 fi
653fi 676fi
677if test x$support_styles = xyes; then
678 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
679fi
680if test x$support_iso14755 = xyes; then
681 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
682fi
683if test x$support_8bitctrls = xyes; then
684 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
685fi
686if test x$support_fading = xyes; then
687 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
688fi
654if test x$support_inheritpixmap = xyes; then 689if test x$support_inheritpixmap = xyes; then
655 support_xrender=yes
656 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
657 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
658 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS"
659 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
660
661 save_LIBS="$LIBS"
662 LIBS="$LIBS $X_LIBS"
663 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[support_xrender=no])
664 AC_CHECK_FUNC(XRenderFindStandardFormat,,[support_xrender=no])
665 LIBS="$save_LIBS"
666 fi
667
668 if test x$support_xrender = xyes; then 690 if test x$rxvt_have_xrender = xyes; then
669 LIBS="$LIBS -lm" 691 LIBS="$LIBS -lm"
670 AC_DEFINE(XRENDER, 1, Define to enable xrender support) 692 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
671 fi 693 fi
672fi
673if test x$support_styles = xyes; then
674 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
675fi
676if test x$support_iso14755 = xyes; then
677 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
678fi
679if test x$support_8bitctrls = xyes; then
680 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
681fi
682if test x$support_fading = xyes; then
683 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
684fi
685if test x$support_inheritpixmap = xyes; then
686 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background) 694 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
687fi 695fi
688if test x$support_keepscrolling = xno; then 696if test x$support_keepscrolling = xno; then
689 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) 697 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
690fi 698fi

Diff Legend

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