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.124 by sf-exg, Mon Jan 3 10:32:08 2011 UTC

… …
431 431
432AC_PATH_PROG(TIC, tic, :) 432AC_PATH_PROG(TIC, tic, :)
433 433
434AC_PATH_XTRA 434AC_PATH_XTRA
435 435
436image_lib=none
437
436PIXBUF_CFLAGS= 438PIXBUF_CFLAGS=
437PIXBUF_LIBS= 439PIXBUF_LIBS=
438 440
439if test x$support_pixbuf = xyes; then 441if test x$support_pixbuf = xyes; then
440 support_pixbuf=no 442 support_pixbuf=no
441 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 443 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
442 AC_MSG_CHECKING(for gdk-pixbuf) 444 AC_MSG_CHECKING(for gdk-pixbuf)
443 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
444 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --cflags`" 446 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
445 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --libs`" 447 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
446 support_pixbuf=yes 448 support_pixbuf=yes
447 fi 449 fi
448 450
449 if test x$support_pixbuf = xyes; then 451 if test x$support_pixbuf = xyes; then
450 AC_MSG_RESULT(ok) 452 AC_MSG_RESULT(ok)
453 image_lib=gdk-pixbuf
451 support_afterimage=no 454 support_afterimage=no
452 AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing) 455 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.) 456 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
454 else 457 else
455 AC_MSG_RESULT(no) 458 AC_MSG_RESULT(no)
… …
486 fi 489 fi
487 fi 490 fi
488 fi 491 fi
489 if test "x$support_afterimage" = "xyes"; then 492 if test "x$support_afterimage" = "xyes"; then
490 AC_MSG_RESULT($AFTERIMAGE_LIBS) 493 AC_MSG_RESULT($AFTERIMAGE_LIBS)
494 image_lib=libafterimage
491 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing) 495 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.) 496 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
493 else 497 else
494 AC_MSG_RESULT(no) 498 AC_MSG_RESULT(no)
495 fi 499 fi
… …
622TTY_GROUP_CHECK 626TTY_GROUP_CHECK
623 627
624dnl# -------------------------------------------------------------------------- 628dnl# --------------------------------------------------------------------------
625dnl# now add and remove other stuff 629dnl# now add and remove other stuff
626dnl# -------------------------------------------------------------------------- 630dnl# --------------------------------------------------------------------------
627if 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
628 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 648 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
629 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 649 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
630 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 650 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
631 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 651 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
632 else 652 else
… …
635 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 655 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
636 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 656 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
637 fi 657 fi
638 fi 658 fi
639 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
640 save_LIBS="$LIBS" 665 save_LIBS="$LIBS"
641 LIBS="$LIBS $X_LIBS" 666 LIBS="$LIBS $X_LIBS"
642 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 667 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
643 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])
644 LIBS="$save_LIBS" 671 LIBS="$save_LIBS"
645 672
646 if test x$support_xft = xyes; then 673 if test x$support_xft = xyes; then
647 AC_DEFINE(XFT, 1, Define to enable xft support) 674 AC_DEFINE(XFT, 1, Define to enable xft support)
648 fi 675 fi
… …
658fi 685fi
659if test x$support_fading = xyes; then 686if test x$support_fading = xyes; then
660 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) 687 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
661fi 688fi
662if test x$support_inheritpixmap = xyes; then 689if test x$support_inheritpixmap = xyes; then
690 if test x$rxvt_have_xrender = xyes; then
691 LIBS="$LIBS -lm"
692 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
693 fi
663 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)
664 test x$support_xft = xyes && LIBS="$LIBS -lm"
665fi 695fi
666if test x$support_keepscrolling = xno; then 696if 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) 697 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
668fi 698fi
669if test x$support_selectionscrolling = xyes; then 699if test x$support_selectionscrolling = xyes; then
… …
792if test x$RESFALLBACK != x; then 822if test x$RESFALLBACK != x; then
793 echo " resource class fallback: $RESFALLBACK" 823 echo " resource class fallback: $RESFALLBACK"
794fi 824fi
795echo 825echo
796echo " embedded perl: $support_perl" 826echo " embedded perl: $support_perl"
797echo " libafterimage: $support_afterimage" 827echo " image library: $image_lib"
798echo 828echo
799if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then 829if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then
800 echo ".----------------------------------------------------------------." 830 echo ".----------------------------------------------------------------."
801 echo ". WARNING: --enable-xim was specified however the locale support ." 831 echo ". WARNING: --enable-xim was specified however the locale support ."
802 echo ". functions could not be found. ." 832 echo ". functions could not be found. ."

Diff Legend

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