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.141 by sf-exg, Sat Feb 4 21:47:06 2012 UTC vs.
Revision 1.150 by sf-exg, Sat Nov 8 13:00:55 2014 UTC

… …
440 440
441 if test x$support_pixbuf = xyes; then 441 if test x$support_pixbuf = xyes; then
442 AC_MSG_RESULT(ok) 442 AC_MSG_RESULT(ok)
443 image_lib=gdk-pixbuf 443 image_lib=gdk-pixbuf
444 AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing) 444 AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing)
445 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
446 else 445 else
447 AC_MSG_RESULT(no) 446 AC_MSG_RESULT(no)
448 fi 447 fi
449fi 448fi
450 449
… …
526dnl# -------------------------------------------------------------------------- 525dnl# --------------------------------------------------------------------------
527dnl# -------------------------------------------------------------------------- 526dnl# --------------------------------------------------------------------------
528 527
529dnl# this is a really hack test for some basic Xlocale stuff 528dnl# this is a really hack test for some basic Xlocale stuff
530save_LIBS=$LIBS 529save_LIBS=$LIBS
531save_CFLAGS=$CFLAGS 530save_CXXFLAGS=$CXXFLAGS
532CFLAGS="$CFLAGS $X_CFLAGS" 531CXXFLAGS="$CXXFLAGS $X_CFLAGS"
533LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 532LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
534if test x$support_xim = xyes; then 533if test x$support_xim = xyes; then
535 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 534 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
536 [AC_RUN_IFELSE([AC_LANG_SOURCE([[ 535 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
537 #include <X11/Xlib.h> 536 #include <X11/Xlib.h>
… …
569#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) 568#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
570if test x$rxvt_cv_func_xsetlocale = xyes; then 569if test x$rxvt_cv_func_xsetlocale = xyes; then
571 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 570 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
572fi 571fi
573LIBS=$save_LIBS 572LIBS=$save_LIBS
574CFLAGS=$save_CFLAGS 573CXXFLAGS=$save_CXXFLAGS
575 574
576AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo, 575AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,
577[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])]) 576[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])])
578if test x$rxvt_cv_func_nl_langinfo = xyes; then 577if test x$rxvt_cv_func_nl_langinfo = xyes; then
579 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) 578 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
… …
586TTY_GROUP_CHECK 585TTY_GROUP_CHECK
587 586
588dnl# -------------------------------------------------------------------------- 587dnl# --------------------------------------------------------------------------
589dnl# now add and remove other stuff 588dnl# now add and remove other stuff
590dnl# -------------------------------------------------------------------------- 589dnl# --------------------------------------------------------------------------
590support_image=no
591if test x$support_inheritpixmap = xyes || test x$support_pixbuf = xyes; then
592 support_image=yes
593fi
591if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then 594if test x$support_xft = xyes || test x$support_image = xyes; then
592 rxvt_have_xrender=no 595 rxvt_have_xrender=no
593 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 596 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
594 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then 597 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
595 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS" 598 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS"
596 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`" 599 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
… …
622 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`" 625 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
623 fi 626 fi
624 627
625 save_LIBS="$LIBS" 628 save_LIBS="$LIBS"
626 LIBS="$LIBS $X_LIBS" 629 LIBS="$LIBS $X_LIBS"
627 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
628 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
629 AC_CHECK_HEADERS(fontconfig/fontconfig.h,,[support_xft=no]) 630 AC_CHECK_HEADERS(X11/Xft/Xft.h fontconfig/fontconfig.h,,[support_xft=no])
630 AC_CHECK_LIB(fontconfig,FcPatternGet,:,[support_xft=no]) 631 AC_CHECK_FUNCS(XftDrawString32 FcPatternGet,,[support_xft=no])
631 LIBS="$save_LIBS" 632 LIBS="$save_LIBS"
632 633
633 if test x$support_xft = xyes; then 634 if test x$support_xft = xyes; then
634 AC_DEFINE(XFT, 1, Define to enable xft support) 635 AC_DEFINE(XFT, 1, Define to enable xft support)
635 fi 636 fi
636fi 637fi
638
639if test x$support_image = xyes && test x$rxvt_have_xrender = xyes; then
640 AC_MSG_CHECKING(for Render >= 0.11)
641 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
642#include <X11/extensions/Xrender.h>
643#if RENDER_MAJOR == 0 && RENDER_MINOR <= 10
644error
645#endif
646]])],[],[support_image=no])
647 if test x$support_image = xyes; then
648 AC_MSG_RESULT(ok)
649 LIBS="$LIBS -lm"
650 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
651
652 if test x$support_inheritpixmap = xyes; then
653 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
654 fi
655 else
656 AC_MSG_RESULT(no)
657 fi
658fi
659
637if test x$support_styles = xyes; then 660if test x$support_styles = xyes; then
638 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support) 661 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
639fi 662fi
640if test x$support_iso14755 = xyes; then 663if test x$support_iso14755 = xyes; then
641 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support) 664 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
… …
643if test x$support_8bitctrls = xyes; then 666if test x$support_8bitctrls = xyes; then
644 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences) 667 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
645fi 668fi
646if test x$support_fading = xyes; then 669if test x$support_fading = xyes; then
647 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) 670 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
648fi
649if test x$support_inheritpixmap = xyes; then
650 if test x$rxvt_have_xrender = xyes; then
651 LIBS="$LIBS -lm"
652 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
653 fi
654 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
655fi 671fi
656if test x$support_keepscrolling = xno; then 672if test x$support_keepscrolling = xno; then
657 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) 673 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
658fi 674fi
659if test x$support_selectionscrolling = xyes; then 675if test x$support_selectionscrolling = xyes; then
… …
711 esac 727 esac
712done 728done
713 729
714IF_PERL=\# 730IF_PERL=\#
715if test x$support_perl = xyes; then 731if test x$support_perl = xyes; then
716 AC_PATH_PROG(PERL, perl5) 732 AC_PATH_PROG(PERL, perl5, perl)
717 AC_PATH_PROG(PERL, perl)
718 733
719 AC_MSG_CHECKING(for $PERL suitability) 734 AC_MSG_CHECKING(for $PERL suitability)
720 if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then 735 if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then
721 736
722 save_CXXFLAGS="$CXXFLAGS" 737 save_CXXFLAGS="$CXXFLAGS"

Diff Legend

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