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.121 by sf-exg, Mon Nov 29 12:33:21 2010 UTC

… …
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_afterimage=yes 98support_afterimage=yes
99support_afterstep=yes
100support_xft=yes 99support_xft=yes
101support_unicode3=no 100support_unicode3=no
102support_combining=yes 101support_combining=yes
103support_8bitctrls=no 102support_8bitctrls=no
104support_iso14755=yes 103support_iso14755=yes
… …
130 support_scroll_xterm=no 129 support_scroll_xterm=no
131 support_utmp=no 130 support_utmp=no
132 support_wtmp=no 131 support_wtmp=no
133 support_xim=no 132 support_xim=no
134 support_afterimage=no 133 support_afterimage=no
135 support_afterstep=no
136 support_xft=no 134 support_xft=no
137 support_unicode3=no 135 support_unicode3=no
138 support_combining=no 136 support_combining=no
139 support_8bitctrls=no 137 support_8bitctrls=no
140 support_iso14755=no 138 support_iso14755=no
… …
158 support_scroll_xterm=yes 156 support_scroll_xterm=yes
159 support_utmp=yes 157 support_utmp=yes
160 support_wtmp=yes 158 support_wtmp=yes
161 support_xim=yes 159 support_xim=yes
162 support_afterimage=yes 160 support_afterimage=yes
163 support_afterstep=yes
164 support_xft=yes 161 support_xft=yes
165 support_unicode3=yes 162 support_unicode3=yes
166 support_combining=yes 163 support_combining=yes
167 #support_8bitctrls=yes 164 #support_8bitctrls=yes
168 support_iso14755=yes 165 support_iso14755=yes
… …
242 [ --with-afterimage-config=DIR use libAfterImage config script in DIR], 239 [ --with-afterimage-config=DIR use libAfterImage config script in DIR],
243 [if test "x$withval" != x; then 240 [if test "x$withval" != x; then
244 afterimage_config=$withval/afterimage-config 241 afterimage_config=$withval/afterimage-config
245 fi]) 242 fi])
246 243
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, 244AC_ARG_ENABLE(pixbuf,
254 [ --enable-pixbuf enable integration with gdk-pixbuf for background images], 245 [ --enable-pixbuf enable integration with gdk-pixbuf for background images],
255 [if test x$enableval = xyes -o x$enableval = xno; then 246 [if test x$enableval = xyes -o x$enableval = xno; then
256 support_pixbuf=$enableval 247 support_pixbuf=$enableval
257 fi]) 248 fi])
… …
440 431
441AC_PATH_PROG(TIC, tic, :) 432AC_PATH_PROG(TIC, tic, :)
442 433
443AC_PATH_XTRA 434AC_PATH_XTRA
444 435
436image_lib=none
437
445PIXBUF_CFLAGS= 438PIXBUF_CFLAGS=
446PIXBUF_LIBS= 439PIXBUF_LIBS=
447 440
448if test x$support_pixbuf = xyes; then 441if test x$support_pixbuf = xyes; then
449 support_pixbuf=no 442 support_pixbuf=no
… …
455 support_pixbuf=yes 448 support_pixbuf=yes
456 fi 449 fi
457 450
458 if test x$support_pixbuf = xyes; then 451 if test x$support_pixbuf = xyes; then
459 AC_MSG_RESULT(ok) 452 AC_MSG_RESULT(ok)
453 image_lib=gdk-pixbuf
460 support_afterimage=no 454 support_afterimage=no
461 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)
462 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.)
463 else 457 else
464 AC_MSG_RESULT(no) 458 AC_MSG_RESULT(no)
… …
495 fi 489 fi
496 fi 490 fi
497 fi 491 fi
498 if test "x$support_afterimage" = "xyes"; then 492 if test "x$support_afterimage" = "xyes"; then
499 AC_MSG_RESULT($AFTERIMAGE_LIBS) 493 AC_MSG_RESULT($AFTERIMAGE_LIBS)
494 image_lib=libafterimage
500 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)
501 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.)
502 else 497 else
503 AC_MSG_RESULT(no) 498 AC_MSG_RESULT(no)
504 fi 499 fi
… …
631TTY_GROUP_CHECK 626TTY_GROUP_CHECK
632 627
633dnl# -------------------------------------------------------------------------- 628dnl# --------------------------------------------------------------------------
634dnl# now add and remove other stuff 629dnl# now add and remove other stuff
635dnl# -------------------------------------------------------------------------- 630dnl# --------------------------------------------------------------------------
636if 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
637 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 648 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
638 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 649 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
639 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 650 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
640 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 651 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
641 else 652 else
… …
644 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 655 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
645 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 656 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
646 fi 657 fi
647 fi 658 fi
648 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
649 save_LIBS="$LIBS" 665 save_LIBS="$LIBS"
650 LIBS="$LIBS $X_LIBS" 666 LIBS="$LIBS $X_LIBS"
651 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 667 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
652 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])
653 LIBS="$save_LIBS" 671 LIBS="$save_LIBS"
654 672
655 if test x$support_xft = xyes; then 673 if test x$support_xft = xyes; then
656 AC_DEFINE(XFT, 1, Define to enable xft support) 674 AC_DEFINE(XFT, 1, Define to enable xft support)
657 fi 675 fi
… …
667fi 685fi
668if test x$support_fading = xyes; then 686if test x$support_fading = xyes; then
669 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)
670fi 688fi
671if 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
672 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)
673fi 695fi
674if test x$support_keepscrolling = xno; then 696if 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) 697 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
676fi 698fi
… …
684 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) 706 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
685fi 707fi
686if test x$support_mouseslipwheel = xyes; then 708if 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) 709 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
688fi 710fi
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 711
694scrolltypes=plain 712scrolltypes=plain
695AC_DEFINE(PLAIN_SCROLLBAR, 1, Support plain style scrollbars) 713AC_DEFINE(PLAIN_SCROLLBAR, 1, Support plain style scrollbars)
696 714
697if test x$support_scroll_rxvt = xyes; then 715if test x$support_scroll_rxvt = xyes; then
… …
705if test x$support_scroll_xterm = xyes; then 723if test x$support_scroll_xterm = xyes; then
706 AC_DEFINE(XTERM_SCROLLBAR, 1, Support Xterm style scrollbars) 724 AC_DEFINE(XTERM_SCROLLBAR, 1, Support Xterm style scrollbars)
707 scrolltypes="$scrolltypes xterm" 725 scrolltypes="$scrolltypes xterm"
708fi 726fi
709if test x$support_pointer_blank = xyes; then 727if test x$support_pointer_blank = xyes; then
710 AC_DEFINE(POINTER_BLANK, 1, Define if you want hide the pointer while typing) 728 AC_DEFINE(POINTER_BLANK, 1, Define if you want to hide the pointer while typing)
711fi 729fi
712if test x$support_text_blink = xyes; then 730if test x$support_text_blink = xyes; then
713 AC_DEFINE(TEXT_BLINK, 1, Define if you want blinking text support) 731 AC_DEFINE(TEXT_BLINK, 1, Define if you want blinking text support)
714fi 732fi
715if test x$support_unicode3 = xyes; then 733if test x$support_unicode3 = xyes; then
… …
804if test x$RESFALLBACK != x; then 822if test x$RESFALLBACK != x; then
805 echo " resource class fallback: $RESFALLBACK" 823 echo " resource class fallback: $RESFALLBACK"
806fi 824fi
807echo 825echo
808echo " embedded perl: $support_perl" 826echo " embedded perl: $support_perl"
809echo " libafterimage: $support_afterimage" 827echo " image library: $image_lib"
810dnl echo " AfterStep integration: $support_afterstep"
811echo 828echo
812if 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
813 echo ".----------------------------------------------------------------." 830 echo ".----------------------------------------------------------------."
814 echo ". WARNING: --enable-xim was specified however the locale support ." 831 echo ". WARNING: --enable-xim was specified however the locale support ."
815 echo ". functions could not be found. ." 832 echo ". functions could not be found. ."

Diff Legend

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