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.115 by sf-exg, Thu Sep 2 15:48:10 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_afterstep=yes
100support_xft=yes 100support_xft=yes
101support_unicode3=no 101support_unicode3=no
102support_combining=yes 102support_combining=yes
103support_8bitctrls=no 103support_8bitctrls=no
104support_iso14755=yes 104support_iso14755=yes
… …
129 support_scroll_next=no 129 support_scroll_next=no
130 support_scroll_xterm=no 130 support_scroll_xterm=no
131 support_utmp=no 131 support_utmp=no
132 support_wtmp=no 132 support_wtmp=no
133 support_xim=no 133 support_xim=no
134 support_pixbuf=no
134 support_afterimage=no 135 support_afterimage=no
135 support_afterstep=no
136 support_xft=no 136 support_xft=no
137 support_unicode3=no 137 support_unicode3=no
138 support_combining=no 138 support_combining=no
139 support_8bitctrls=no 139 support_8bitctrls=no
140 support_iso14755=no 140 support_iso14755=no
… …
157 support_scroll_next=yes 157 support_scroll_next=yes
158 support_scroll_xterm=yes 158 support_scroll_xterm=yes
159 support_utmp=yes 159 support_utmp=yes
160 support_wtmp=yes 160 support_wtmp=yes
161 support_xim=yes 161 support_xim=yes
162 support_pixbuf=yes
162 support_afterimage=yes 163 support_afterimage=yes
163 support_afterstep=yes
164 support_xft=yes 164 support_xft=yes
165 support_unicode3=yes 165 support_unicode3=yes
166 support_combining=yes 166 support_combining=yes
167 #support_8bitctrls=yes 167 #support_8bitctrls=yes
168 support_iso14755=yes 168 support_iso14755=yes
… …
242 [ --with-afterimage-config=DIR use libAfterImage config script in DIR], 242 [ --with-afterimage-config=DIR use libAfterImage config script in DIR],
243 [if test "x$withval" != x; then 243 [if test "x$withval" != x; then
244 afterimage_config=$withval/afterimage-config 244 afterimage_config=$withval/afterimage-config
245 fi]) 245 fi])
246 246
247dnl AC_ARG_ENABLE(afterstep,
248dnl [ --enable-afterstep enable integration with AfterStep window manager],
249dnl [if test x$enableval = xyes -o x$enableval = xno; then
250dnl support_afterstep=$enableval
251dnl fi])
252
253AC_ARG_ENABLE(pixbuf, 247AC_ARG_ENABLE(pixbuf,
254 [ --enable-pixbuf enable integration with gdk-pixbuf for background images], 248 [ --enable-pixbuf enable integration with gdk-pixbuf for background images],
255 [if test x$enableval = xyes -o x$enableval = xno; then 249 [if test x$enableval = xyes -o x$enableval = xno; then
256 support_pixbuf=$enableval 250 support_pixbuf=$enableval
257 fi]) 251 fi])
… …
440 434
441AC_PATH_PROG(TIC, tic, :) 435AC_PATH_PROG(TIC, tic, :)
442 436
443AC_PATH_XTRA 437AC_PATH_XTRA
444 438
439image_lib=none
440
445PIXBUF_CFLAGS= 441PIXBUF_CFLAGS=
446PIXBUF_LIBS= 442PIXBUF_LIBS=
447 443
448if test x$support_pixbuf = xyes; then 444if test x$support_pixbuf = xyes; then
449 support_pixbuf=no 445 support_pixbuf=no
450 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 446 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
451 AC_MSG_CHECKING(for gdk-pixbuf) 447 AC_MSG_CHECKING(for gdk-pixbuf)
452 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
453 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --cflags`" 449 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
454 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --libs`" 450 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
455 support_pixbuf=yes 451 support_pixbuf=yes
456 fi 452 fi
457 453
458 if test x$support_pixbuf = xyes; then 454 if test x$support_pixbuf = xyes; then
459 AC_MSG_RESULT(ok) 455 AC_MSG_RESULT(ok)
456 image_lib=gdk-pixbuf
460 support_afterimage=no 457 support_afterimage=no
461 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)
462 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.)
463 else 460 else
464 AC_MSG_RESULT(no) 461 AC_MSG_RESULT(no)
… …
495 fi 492 fi
496 fi 493 fi
497 fi 494 fi
498 if test "x$support_afterimage" = "xyes"; then 495 if test "x$support_afterimage" = "xyes"; then
499 AC_MSG_RESULT($AFTERIMAGE_LIBS) 496 AC_MSG_RESULT($AFTERIMAGE_LIBS)
497 image_lib=libafterimage
500 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)
501 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.)
502 else 500 else
503 AC_MSG_RESULT(no) 501 AC_MSG_RESULT(no)
504 fi 502 fi
… …
518 sys/strredir.h \ 516 sys/strredir.h \
519 stdint.h \ 517 stdint.h \
520 wchar.h \ 518 wchar.h \
521 cwchar \ 519 cwchar \
522) 520)
523
524AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
525[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
526if test x$rxvt_cv_xpointer = xyes; then
527 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
528fi
529 521
530AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access, 522AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
531[AC_COMPILE_IFELSE( 523[AC_COMPILE_IFELSE(
532 [AC_LANG_PROGRAM([ 524 [AC_LANG_PROGRAM([
533#define XLIB_ILLEGAL_ACCESS 525#define XLIB_ILLEGAL_ACCESS
… …
571save_CFLAGS=$CFLAGS 563save_CFLAGS=$CFLAGS
572CFLAGS="$CFLAGS $X_CFLAGS" 564CFLAGS="$CFLAGS $X_CFLAGS"
573LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 565LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
574if test x$support_xim = xyes; then 566if test x$support_xim = xyes; then
575 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 567 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
576 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 568 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
569 #include <X11/Xlib.h>
577 #include <stdlib.h> 570 #include <stdlib.h>
578 main() { 571 int main() {
579 char *p; 572 char *p;
580 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 573 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
581 exit (XSupportsLocale() ? 0 : 1); 574 exit (XSupportsLocale() ? 0 : 1);
582 else 575 else
583 exit (1);}]])],[dnl 576 exit (1);
577 }
584 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 578 ]])],[rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[:])])
585 :])])
586 if test x$rxvt_cv_func_xlocale = xyes; then 579 if test x$rxvt_cv_func_xlocale = xyes; then
587 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)
588 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb, 581 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
589 [AC_COMPILE_IFELSE([ 582 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
590 #include <X11/Xlib.h> 583 #include <X11/Xlib.h>
591 584
592 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); 585 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
593 586
594 void f() { 587 void f() {
595 XIMCallback cb; 588 XIMCallback cb;
596 cb.callback = im_destroy_cb; 589 cb.callback = im_destroy_cb;
597 } 590 }
598 ],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)]) 591 ]])],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
599 592
600 if test x$rxvt_cv_broken_ximcb = xyes; then 593 if test x$rxvt_cv_broken_ximcb = xyes; then
601 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.)
602 fi 595 fi
603 fi 596 fi
… …
631TTY_GROUP_CHECK 624TTY_GROUP_CHECK
632 625
633dnl# -------------------------------------------------------------------------- 626dnl# --------------------------------------------------------------------------
634dnl# now add and remove other stuff 627dnl# now add and remove other stuff
635dnl# -------------------------------------------------------------------------- 628dnl# --------------------------------------------------------------------------
636if 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
637 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 646 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
638 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 647 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
639 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 648 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
640 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 649 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
641 else 650 else
… …
644 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 653 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
645 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 654 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
646 fi 655 fi
647 fi 656 fi
648 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
649 save_LIBS="$LIBS" 663 save_LIBS="$LIBS"
650 LIBS="$LIBS $X_LIBS" 664 LIBS="$LIBS $X_LIBS"
651 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 665 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
652 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])
653 LIBS="$save_LIBS" 669 LIBS="$save_LIBS"
654 670
655 if test x$support_xft = xyes; then 671 if test x$support_xft = xyes; then
656 AC_DEFINE(XFT, 1, Define to enable xft support) 672 AC_DEFINE(XFT, 1, Define to enable xft support)
657 fi 673 fi
… …
667fi 683fi
668if test x$support_fading = xyes; then 684if test x$support_fading = xyes; then
669 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) 685 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
670fi 686fi
671if test x$support_inheritpixmap = xyes; then 687if test x$support_inheritpixmap = xyes; then
688 if test x$rxvt_have_xrender = xyes; then
689 LIBS="$LIBS -lm"
690 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
691 fi
672 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)
673fi 693fi
674if test x$support_keepscrolling = xno; then 694if test x$support_keepscrolling = xno; then
675 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)
676fi 696fi
… …
684 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) 704 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
685fi 705fi
686if test x$support_mouseslipwheel = xyes; then 706if test x$support_mouseslipwheel = xyes; then
687 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling) 707 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
688fi 708fi
689
690dnl if test x$support_afterstep = xyes; then
691dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)
692dnl fi
693 709
694scrolltypes=plain 710scrolltypes=plain
695AC_DEFINE(PLAIN_SCROLLBAR, 1, Support plain style scrollbars) 711AC_DEFINE(PLAIN_SCROLLBAR, 1, Support plain style scrollbars)
696 712
697if test x$support_scroll_rxvt = xyes; then 713if test x$support_scroll_rxvt = xyes; then
… …
705if test x$support_scroll_xterm = xyes; then 721if test x$support_scroll_xterm = xyes; then
706 AC_DEFINE(XTERM_SCROLLBAR, 1, Support Xterm style scrollbars) 722 AC_DEFINE(XTERM_SCROLLBAR, 1, Support Xterm style scrollbars)
707 scrolltypes="$scrolltypes xterm" 723 scrolltypes="$scrolltypes xterm"
708fi 724fi
709if test x$support_pointer_blank = xyes; then 725if test x$support_pointer_blank = xyes; then
710 AC_DEFINE(POINTER_BLANK, 1, Define if you want hide the pointer while typing) 726 AC_DEFINE(POINTER_BLANK, 1, Define if you want to hide the pointer while typing)
711fi 727fi
712if test x$support_text_blink = xyes; then 728if test x$support_text_blink = xyes; then
713 AC_DEFINE(TEXT_BLINK, 1, Define if you want blinking text support) 729 AC_DEFINE(TEXT_BLINK, 1, Define if you want blinking text support)
714fi 730fi
715if test x$support_unicode3 = xyes; then 731if test x$support_unicode3 = xyes; then
… …
804if test x$RESFALLBACK != x; then 820if test x$RESFALLBACK != x; then
805 echo " resource class fallback: $RESFALLBACK" 821 echo " resource class fallback: $RESFALLBACK"
806fi 822fi
807echo 823echo
808echo " embedded perl: $support_perl" 824echo " embedded perl: $support_perl"
809echo " libafterimage: $support_afterimage" 825echo " image library: $image_lib"
810dnl echo " AfterStep integration: $support_afterstep"
811echo 826echo
812if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then 827if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then
813 echo ".----------------------------------------------------------------." 828 echo ".----------------------------------------------------------------."
814 echo ". WARNING: --enable-xim was specified however the locale support ." 829 echo ". WARNING: --enable-xim was specified however the locale support ."
815 echo ". functions could not be found. ." 830 echo ". functions could not be found. ."

Diff Legend

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