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.123 by root, Mon Jan 3 03:05:47 2011 UTC

… …
440 440
441if test x$support_pixbuf = xyes; then 441if test x$support_pixbuf = xyes; then
442 support_pixbuf=no 442 support_pixbuf=no
443 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 443 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
444 AC_MSG_CHECKING(for gdk-pixbuf) 444 AC_MSG_CHECKING(for gdk-pixbuf)
445 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-xlib-2.0; then 445 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then
446 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --cflags`" 446 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
447 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --libs`" 447 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
448 support_pixbuf=yes 448 support_pixbuf=yes
449 fi 449 fi
450 450
451 if test x$support_pixbuf = xyes; then 451 if test x$support_pixbuf = xyes; then
452 AC_MSG_RESULT(ok) 452 AC_MSG_RESULT(ok)
… …
505 505
506dnl# -------------------------------------------------------------------------- 506dnl# --------------------------------------------------------------------------
507dnl# CHECKING FOR HEADER FILES 507dnl# CHECKING FOR HEADER FILES
508dnl# -------------------------------------------------------------------------- 508dnl# --------------------------------------------------------------------------
509AC_CHECK_HEADERS( \ 509AC_CHECK_HEADERS( \
510 sys/byteorder.h \
511 sys/ioctl.h \ 510 sys/ioctl.h \
512 sys/sockio.h \ 511 sys/sockio.h \
513 sys/strredir.h \ 512 sys/strredir.h \
514 stdint.h \ 513 stdint.h \
515 wchar.h \ 514 wchar.h \
… …
626TTY_GROUP_CHECK 625TTY_GROUP_CHECK
627 626
628dnl# -------------------------------------------------------------------------- 627dnl# --------------------------------------------------------------------------
629dnl# now add and remove other stuff 628dnl# now add and remove other stuff
630dnl# -------------------------------------------------------------------------- 629dnl# --------------------------------------------------------------------------
631if test x$support_xft = xyes; then 630if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then
631 rxvt_have_xrender=no
632 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
633 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
634 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS"
635 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
636 rxvt_have_xrender=yes
637
638 save_LIBS="$LIBS"
639 LIBS="$LIBS $X_LIBS"
640 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no])
641 AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no])
642 LIBS="$save_LIBS"
643 fi
644fi
645
646if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then
632 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 647 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
633 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 648 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
634 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 649 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
635 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 650 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
636 else 651 else
… …
639 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 654 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
640 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 655 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
641 fi 656 fi
642 fi 657 fi
643 658
659 if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then
660 X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS"
661 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
662 fi
663
644 save_LIBS="$LIBS" 664 save_LIBS="$LIBS"
645 LIBS="$LIBS $X_LIBS" 665 LIBS="$LIBS $X_LIBS"
646 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 666 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
647 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no]) 667 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
668 AC_CHECK_HEADERS(fontconfig/fontconfig.h,,[support_xft=no])
669 AC_CHECK_LIB(fontconfig,FcPatternGet,:,[support_xft=no])
648 LIBS="$save_LIBS" 670 LIBS="$save_LIBS"
649 671
650 if test x$support_xft = xyes; then 672 if test x$support_xft = xyes; then
651 AC_DEFINE(XFT, 1, Define to enable xft support) 673 AC_DEFINE(XFT, 1, Define to enable xft support)
652 fi 674 fi
653fi 675fi
676if test x$support_styles = xyes; then
677 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
678fi
679if test x$support_iso14755 = xyes; then
680 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
681fi
682if test x$support_8bitctrls = xyes; then
683 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
684fi
685if test x$support_fading = xyes; then
686 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
687fi
654if test x$support_inheritpixmap = xyes; then 688if 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 689 if test x$rxvt_have_xrender = xyes; then
669 LIBS="$LIBS -lm" 690 LIBS="$LIBS -lm"
670 AC_DEFINE(XRENDER, 1, Define to enable xrender support) 691 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
671 fi 692 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) 693 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
687fi 694fi
688if test x$support_keepscrolling = xno; then 695if 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) 696 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
690fi 697fi

Diff Legend

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