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.129 by sf-exg, Sat Jan 8 17:30:46 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)
… …
514 stdint.h \ 517 stdint.h \
515 wchar.h \ 518 wchar.h \
516 cwchar \ 519 cwchar \
517) 520)
518 521
519AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
520[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
521if test x$rxvt_cv_xpointer = xyes; then
522 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
523fi
524
525AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access, 522AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
526[AC_COMPILE_IFELSE( 523[AC_COMPILE_IFELSE(
527 [AC_LANG_PROGRAM([ 524 [AC_LANG_PROGRAM([
528#define XLIB_ILLEGAL_ACCESS 525#define XLIB_ILLEGAL_ACCESS
529#include <X11/Xlib.h> 526#include <X11/Xlib.h>
… …
566save_CFLAGS=$CFLAGS 563save_CFLAGS=$CFLAGS
567CFLAGS="$CFLAGS $X_CFLAGS" 564CFLAGS="$CFLAGS $X_CFLAGS"
568LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 565LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
569if test x$support_xim = xyes; then 566if test x$support_xim = xyes; then
570 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 567 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
571 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 568 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
569 #include <X11/Xlib.h>
572 #include <stdlib.h> 570 #include <stdlib.h>
573 main() { 571 int main() {
574 char *p; 572 char *p;
575 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 573 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
576 exit (XSupportsLocale() ? 0 : 1); 574 exit (XSupportsLocale() ? 0 : 1);
577 else 575 else
578 exit (1);}]])],[dnl 576 exit (1);
577 }
579 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 578 ]])],[rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[:])])
580 :])])
581 if test x$rxvt_cv_func_xlocale = xyes; then 579 if test x$rxvt_cv_func_xlocale = xyes; then
582 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input) 580 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
583 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb, 581 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
584 [AC_COMPILE_IFELSE([ 582 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
585 #include <X11/Xlib.h> 583 #include <X11/Xlib.h>
586 584
587 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); 585 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
588 586
589 void f() { 587 void f() {
590 XIMCallback cb; 588 XIMCallback cb;
591 cb.callback = im_destroy_cb; 589 cb.callback = im_destroy_cb;
592 } 590 }
593 ],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)]) 591 ]])],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
594 592
595 if test x$rxvt_cv_broken_ximcb = xyes; then 593 if test x$rxvt_cv_broken_ximcb = xyes; then
596 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.) 594 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
597 fi 595 fi
598 fi 596 fi
… …
626TTY_GROUP_CHECK 624TTY_GROUP_CHECK
627 625
628dnl# -------------------------------------------------------------------------- 626dnl# --------------------------------------------------------------------------
629dnl# now add and remove other stuff 627dnl# now add and remove other stuff
630dnl# -------------------------------------------------------------------------- 628dnl# --------------------------------------------------------------------------
631if test x$support_xft = xyes; then 629if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then
630 rxvt_have_xrender=no
631 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
632 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
633 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS"
634 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
635 rxvt_have_xrender=yes
636
637 save_LIBS="$LIBS"
638 LIBS="$LIBS $X_LIBS"
639 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no])
640 AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no])
641 LIBS="$save_LIBS"
642 fi
643fi
644
645if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then
632 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 646 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
633 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 647 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
634 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 648 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
635 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 649 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
636 else 650 else
… …
639 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 653 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
640 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 654 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
641 fi 655 fi
642 fi 656 fi
643 657
658 if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then
659 X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS"
660 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
661 fi
662
644 save_LIBS="$LIBS" 663 save_LIBS="$LIBS"
645 LIBS="$LIBS $X_LIBS" 664 LIBS="$LIBS $X_LIBS"
646 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 665 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
647 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no]) 666 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
667 AC_CHECK_HEADERS(fontconfig/fontconfig.h,,[support_xft=no])
668 AC_CHECK_LIB(fontconfig,FcPatternGet,:,[support_xft=no])
648 LIBS="$save_LIBS" 669 LIBS="$save_LIBS"
649 670
650 if test x$support_xft = xyes; then 671 if test x$support_xft = xyes; then
651 AC_DEFINE(XFT, 1, Define to enable xft support) 672 AC_DEFINE(XFT, 1, Define to enable xft support)
652 fi 673 fi
653fi 674fi
675if test x$support_styles = xyes; then
676 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
677fi
678if test x$support_iso14755 = xyes; then
679 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
680fi
681if test x$support_8bitctrls = xyes; then
682 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
683fi
684if test x$support_fading = xyes; then
685 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
686fi
654if test x$support_inheritpixmap = xyes; then 687if 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 688 if test x$rxvt_have_xrender = xyes; then
669 LIBS="$LIBS -lm" 689 LIBS="$LIBS -lm"
670 AC_DEFINE(XRENDER, 1, Define to enable xrender support) 690 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
671 fi 691 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) 692 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
687fi 693fi
688if test x$support_keepscrolling = xno; then 694if 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) 695 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
690fi 696fi

Diff Legend

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