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.117 by sf-exg, Fri Oct 8 18:57:04 2010 UTC vs.
Revision 1.128 by sf-exg, Wed Jan 5 17:41:24 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
… …
431 434
432AC_PATH_PROG(TIC, tic, :) 435AC_PATH_PROG(TIC, tic, :)
433 436
434AC_PATH_XTRA 437AC_PATH_XTRA
435 438
439image_lib=none
440
436PIXBUF_CFLAGS= 441PIXBUF_CFLAGS=
437PIXBUF_LIBS= 442PIXBUF_LIBS=
438 443
439if test x$support_pixbuf = xyes; then 444if test x$support_pixbuf = xyes; then
440 support_pixbuf=no 445 support_pixbuf=no
441 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 446 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
442 AC_MSG_CHECKING(for gdk-pixbuf) 447 AC_MSG_CHECKING(for gdk-pixbuf)
443 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
444 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --cflags`" 449 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
445 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --libs`" 450 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
446 support_pixbuf=yes 451 support_pixbuf=yes
447 fi 452 fi
448 453
449 if test x$support_pixbuf = xyes; then 454 if test x$support_pixbuf = xyes; then
450 AC_MSG_RESULT(ok) 455 AC_MSG_RESULT(ok)
456 image_lib=gdk-pixbuf
451 support_afterimage=no 457 support_afterimage=no
452 AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing) 458 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.) 459 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
454 else 460 else
455 AC_MSG_RESULT(no) 461 AC_MSG_RESULT(no)
… …
486 fi 492 fi
487 fi 493 fi
488 fi 494 fi
489 if test "x$support_afterimage" = "xyes"; then 495 if test "x$support_afterimage" = "xyes"; then
490 AC_MSG_RESULT($AFTERIMAGE_LIBS) 496 AC_MSG_RESULT($AFTERIMAGE_LIBS)
497 image_lib=libafterimage
491 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing) 498 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.) 499 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
493 else 500 else
494 AC_MSG_RESULT(no) 501 AC_MSG_RESULT(no)
495 fi 502 fi
… …
509 sys/strredir.h \ 516 sys/strredir.h \
510 stdint.h \ 517 stdint.h \
511 wchar.h \ 518 wchar.h \
512 cwchar \ 519 cwchar \
513) 520)
514
515AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
516[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
517if test x$rxvt_cv_xpointer = xyes; then
518 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
519fi
520 521
521AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access, 522AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
522[AC_COMPILE_IFELSE( 523[AC_COMPILE_IFELSE(
523 [AC_LANG_PROGRAM([ 524 [AC_LANG_PROGRAM([
524#define XLIB_ILLEGAL_ACCESS 525#define XLIB_ILLEGAL_ACCESS
… …
564LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 565LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
565if test x$support_xim = xyes; then 566if test x$support_xim = xyes; then
566 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 567 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
567 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 568 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
568 #include <stdlib.h> 569 #include <stdlib.h>
569 main() { 570 int main() {
570 char *p; 571 char *p;
571 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 572 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
572 exit (XSupportsLocale() ? 0 : 1); 573 exit (XSupportsLocale() ? 0 : 1);
573 else 574 else
574 exit (1);}]])],[dnl 575 exit (1);}]])],[dnl
575 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 576 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
576 :])]) 577 :])])
577 if test x$rxvt_cv_func_xlocale = xyes; then 578 if test x$rxvt_cv_func_xlocale = xyes; then
578 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input) 579 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
579 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb, 580 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
580 [AC_COMPILE_IFELSE([ 581 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
581 #include <X11/Xlib.h> 582 #include <X11/Xlib.h>
582 583
583 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); 584 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
584 585
585 void f() { 586 void f() {
586 XIMCallback cb; 587 XIMCallback cb;
587 cb.callback = im_destroy_cb; 588 cb.callback = im_destroy_cb;
588 } 589 }
589 ],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)]) 590 ]])],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
590 591
591 if test x$rxvt_cv_broken_ximcb = xyes; then 592 if test x$rxvt_cv_broken_ximcb = xyes; then
592 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.) 593 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
593 fi 594 fi
594 fi 595 fi
… …
622TTY_GROUP_CHECK 623TTY_GROUP_CHECK
623 624
624dnl# -------------------------------------------------------------------------- 625dnl# --------------------------------------------------------------------------
625dnl# now add and remove other stuff 626dnl# now add and remove other stuff
626dnl# -------------------------------------------------------------------------- 627dnl# --------------------------------------------------------------------------
627if test x$support_xft = xyes; then 628if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then
629 rxvt_have_xrender=no
630 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
631 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
632 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS"
633 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
634 rxvt_have_xrender=yes
635
636 save_LIBS="$LIBS"
637 LIBS="$LIBS $X_LIBS"
638 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no])
639 AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no])
640 LIBS="$save_LIBS"
641 fi
642fi
643
644if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then
628 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 645 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
629 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 646 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
630 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 647 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
631 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 648 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
632 else 649 else
… …
635 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 652 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
636 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 653 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
637 fi 654 fi
638 fi 655 fi
639 656
657 if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then
658 X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS"
659 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
660 fi
661
640 save_LIBS="$LIBS" 662 save_LIBS="$LIBS"
641 LIBS="$LIBS $X_LIBS" 663 LIBS="$LIBS $X_LIBS"
642 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 664 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
643 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no]) 665 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
666 AC_CHECK_HEADERS(fontconfig/fontconfig.h,,[support_xft=no])
667 AC_CHECK_LIB(fontconfig,FcPatternGet,:,[support_xft=no])
644 LIBS="$save_LIBS" 668 LIBS="$save_LIBS"
645 669
646 if test x$support_xft = xyes; then 670 if test x$support_xft = xyes; then
647 AC_DEFINE(XFT, 1, Define to enable xft support) 671 AC_DEFINE(XFT, 1, Define to enable xft support)
648 fi 672 fi
… …
658fi 682fi
659if test x$support_fading = xyes; then 683if test x$support_fading = xyes; then
660 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) 684 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
661fi 685fi
662if test x$support_inheritpixmap = xyes; then 686if test x$support_inheritpixmap = xyes; then
687 if test x$rxvt_have_xrender = xyes; then
688 LIBS="$LIBS -lm"
689 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
690 fi
663 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background) 691 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
664fi 692fi
665if test x$support_keepscrolling = xno; then 693if test x$support_keepscrolling = xno; then
666 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) 694 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
667fi 695fi
… …
791if test x$RESFALLBACK != x; then 819if test x$RESFALLBACK != x; then
792 echo " resource class fallback: $RESFALLBACK" 820 echo " resource class fallback: $RESFALLBACK"
793fi 821fi
794echo 822echo
795echo " embedded perl: $support_perl" 823echo " embedded perl: $support_perl"
796echo " libafterimage: $support_afterimage" 824echo " image library: $image_lib"
797echo 825echo
798if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then 826if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then
799 echo ".----------------------------------------------------------------." 827 echo ".----------------------------------------------------------------."
800 echo ". WARNING: --enable-xim was specified however the locale support ." 828 echo ". WARNING: --enable-xim was specified however the locale support ."
801 echo ". functions could not be found. ." 829 echo ". functions could not be found. ."

Diff Legend

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