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.118 by sf-exg, Wed Oct 13 23:04:56 2010 UTC vs.
Revision 1.130 by mikachu, Sun Nov 13 16:03:31 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
99support_startup_notification=yes
98support_afterimage=yes 100support_afterimage=yes
99support_xft=yes 101support_xft=yes
100support_unicode3=no 102support_unicode3=no
101support_combining=yes 103support_combining=yes
102support_8bitctrls=no 104support_8bitctrls=no
… …
128 support_scroll_next=no 130 support_scroll_next=no
129 support_scroll_xterm=no 131 support_scroll_xterm=no
130 support_utmp=no 132 support_utmp=no
131 support_wtmp=no 133 support_wtmp=no
132 support_xim=no 134 support_xim=no
135 support_pixbuf=no
136 support_startup_notification=no
133 support_afterimage=no 137 support_afterimage=no
134 support_xft=no 138 support_xft=no
135 support_unicode3=no 139 support_unicode3=no
136 support_combining=no 140 support_combining=no
137 support_8bitctrls=no 141 support_8bitctrls=no
… …
155 support_scroll_next=yes 159 support_scroll_next=yes
156 support_scroll_xterm=yes 160 support_scroll_xterm=yes
157 support_utmp=yes 161 support_utmp=yes
158 support_wtmp=yes 162 support_wtmp=yes
159 support_xim=yes 163 support_xim=yes
164 support_pixbuf=yes
165 support_startup_notification=yes
160 support_afterimage=yes 166 support_afterimage=yes
161 support_xft=yes 167 support_xft=yes
162 support_unicode3=yes 168 support_unicode3=yes
163 support_combining=yes 169 support_combining=yes
164 #support_8bitctrls=yes 170 #support_8bitctrls=yes
… …
245 [ --enable-pixbuf enable integration with gdk-pixbuf for background images], 251 [ --enable-pixbuf enable integration with gdk-pixbuf for background images],
246 [if test x$enableval = xyes -o x$enableval = xno; then 252 [if test x$enableval = xyes -o x$enableval = xno; then
247 support_pixbuf=$enableval 253 support_pixbuf=$enableval
248 fi]) 254 fi])
249 255
256AC_ARG_ENABLE(startup-notification,
257 [ --enable-startup-notification enable freedesktop startup notification support],
258 [if test x$enableval = xyes -o x$enableval = xno; then
259 support_startup_notification=$enableval
260 fi])
261
250AC_ARG_ENABLE(transparency, 262AC_ARG_ENABLE(transparency,
251 [ --enable-transparency enable transparent backgrounds], 263 [ --enable-transparency enable transparent backgrounds],
252 [if test x$enableval = xyes -o x$enableval = xno; then 264 [if test x$enableval = xyes -o x$enableval = xno; then
253 support_inheritpixmap=$enableval 265 support_inheritpixmap=$enableval
254 fi]) 266 fi])
… …
431 443
432AC_PATH_PROG(TIC, tic, :) 444AC_PATH_PROG(TIC, tic, :)
433 445
434AC_PATH_XTRA 446AC_PATH_XTRA
435 447
448image_lib=none
449
436PIXBUF_CFLAGS= 450PIXBUF_CFLAGS=
437PIXBUF_LIBS= 451PIXBUF_LIBS=
438 452
439if test x$support_pixbuf = xyes; then 453if test x$support_pixbuf = xyes; then
440 support_pixbuf=no 454 support_pixbuf=no
441 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 455 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
442 AC_MSG_CHECKING(for gdk-pixbuf) 456 AC_MSG_CHECKING(for gdk-pixbuf)
443 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-xlib-2.0; then 457 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then
444 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --cflags`" 458 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
445 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --libs`" 459 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
446 support_pixbuf=yes 460 support_pixbuf=yes
447 fi 461 fi
448 462
449 if test x$support_pixbuf = xyes; then 463 if test x$support_pixbuf = xyes; then
450 AC_MSG_RESULT(ok) 464 AC_MSG_RESULT(ok)
465 image_lib=gdk-pixbuf
451 support_afterimage=no 466 support_afterimage=no
452 AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing) 467 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.) 468 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
454 else 469 else
455 AC_MSG_RESULT(no) 470 AC_MSG_RESULT(no)
456 fi 471 fi
457fi 472fi
458 473
459AC_SUBST(PIXBUF_CFLAGS) 474AC_SUBST(PIXBUF_CFLAGS)
460AC_SUBST(PIXBUF_LIBS) 475AC_SUBST(PIXBUF_LIBS)
476
477STARTUP_NOTIFICATION_CFLAGS=
478STARTUP_NOTIFICATION_LIBS=
479
480if test x$support_startup_notification = xyes; then
481 support_startup_notification=no
482 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
483 AC_MSG_CHECKING(for libstartup-notification)
484 if test $PKG_CONFIG != no && $PKG_CONFIG --exists libstartup-notification-1.0; then
485 STARTUP_NOTIFICATION_CFLAGS="`$PKG_CONFIG libstartup-notification-1.0 --cflags`"
486 STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG libstartup-notification-1.0 --libs`"
487 support_startup_notification=yes
488 fi
489
490 if test x$support_startup_notification = xyes; then
491 AC_MSG_RESULT(ok)
492 AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, Define if freedesktop startup notifications should be supported)
493 else
494 AC_MSG_RESULT(no)
495 fi
496fi
497
498AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
499AC_SUBST(STARTUP_NOTIFICATION_LIBS)
461 500
462AFTERIMAGE_CFLAGS= 501AFTERIMAGE_CFLAGS=
463AFTERIMAGE_LIBS= 502AFTERIMAGE_LIBS=
464AFTERIMAGE_VERSION= 503AFTERIMAGE_VERSION=
465 504
… …
486 fi 525 fi
487 fi 526 fi
488 fi 527 fi
489 if test "x$support_afterimage" = "xyes"; then 528 if test "x$support_afterimage" = "xyes"; then
490 AC_MSG_RESULT($AFTERIMAGE_LIBS) 529 AC_MSG_RESULT($AFTERIMAGE_LIBS)
530 image_lib=libafterimage
491 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing) 531 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.) 532 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
493 else 533 else
494 AC_MSG_RESULT(no) 534 AC_MSG_RESULT(no)
495 fi 535 fi
… …
509 sys/strredir.h \ 549 sys/strredir.h \
510 stdint.h \ 550 stdint.h \
511 wchar.h \ 551 wchar.h \
512 cwchar \ 552 cwchar \
513) 553)
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 554
521AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access, 555AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
522[AC_COMPILE_IFELSE( 556[AC_COMPILE_IFELSE(
523 [AC_LANG_PROGRAM([ 557 [AC_LANG_PROGRAM([
524#define XLIB_ILLEGAL_ACCESS 558#define XLIB_ILLEGAL_ACCESS
… …
562save_CFLAGS=$CFLAGS 596save_CFLAGS=$CFLAGS
563CFLAGS="$CFLAGS $X_CFLAGS" 597CFLAGS="$CFLAGS $X_CFLAGS"
564LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 598LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
565if test x$support_xim = xyes; then 599if test x$support_xim = xyes; then
566 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 600 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
567 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 601 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
602 #include <X11/Xlib.h>
568 #include <stdlib.h> 603 #include <stdlib.h>
569 main() { 604 int main() {
570 char *p; 605 char *p;
571 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 606 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
572 exit (XSupportsLocale() ? 0 : 1); 607 exit (XSupportsLocale() ? 0 : 1);
573 else 608 else
574 exit (1);}]])],[dnl 609 exit (1);
610 }
575 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 611 ]])],[rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[:])])
576 :])])
577 if test x$rxvt_cv_func_xlocale = xyes; then 612 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) 613 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, 614 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
580 [AC_COMPILE_IFELSE([ 615 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
581 #include <X11/Xlib.h> 616 #include <X11/Xlib.h>
582 617
583 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); 618 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
584 619
585 void f() { 620 void f() {
586 XIMCallback cb; 621 XIMCallback cb;
587 cb.callback = im_destroy_cb; 622 cb.callback = im_destroy_cb;
588 } 623 }
589 ],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)]) 624 ]])],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
590 625
591 if test x$rxvt_cv_broken_ximcb = xyes; then 626 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.) 627 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
593 fi 628 fi
594 fi 629 fi
… …
622TTY_GROUP_CHECK 657TTY_GROUP_CHECK
623 658
624dnl# -------------------------------------------------------------------------- 659dnl# --------------------------------------------------------------------------
625dnl# now add and remove other stuff 660dnl# now add and remove other stuff
626dnl# -------------------------------------------------------------------------- 661dnl# --------------------------------------------------------------------------
627if test x$support_xft = xyes; then 662if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then
663 rxvt_have_xrender=no
664 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
665 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
666 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS"
667 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
668 rxvt_have_xrender=yes
669
670 save_LIBS="$LIBS"
671 LIBS="$LIBS $X_LIBS"
672 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no])
673 AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no])
674 LIBS="$save_LIBS"
675 fi
676fi
677
678if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then
628 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 679 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
629 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 680 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
630 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 681 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
631 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 682 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
632 else 683 else
… …
635 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 686 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
636 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 687 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
637 fi 688 fi
638 fi 689 fi
639 690
691 if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then
692 X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS"
693 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
694 fi
695
640 save_LIBS="$LIBS" 696 save_LIBS="$LIBS"
641 LIBS="$LIBS $X_LIBS" 697 LIBS="$LIBS $X_LIBS"
642 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 698 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
643 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no]) 699 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
700 AC_CHECK_HEADERS(fontconfig/fontconfig.h,,[support_xft=no])
701 AC_CHECK_LIB(fontconfig,FcPatternGet,:,[support_xft=no])
644 LIBS="$save_LIBS" 702 LIBS="$save_LIBS"
645 703
646 if test x$support_xft = xyes; then 704 if test x$support_xft = xyes; then
647 AC_DEFINE(XFT, 1, Define to enable xft support) 705 AC_DEFINE(XFT, 1, Define to enable xft support)
648 fi 706 fi
… …
658fi 716fi
659if test x$support_fading = xyes; then 717if test x$support_fading = xyes; then
660 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) 718 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
661fi 719fi
662if test x$support_inheritpixmap = xyes; then 720if test x$support_inheritpixmap = xyes; then
721 if test x$rxvt_have_xrender = xyes; then
722 LIBS="$LIBS -lm"
723 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
724 fi
663 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background) 725 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
664 test x$support_xft = xyes && LIBS="$LIBS -lm"
665fi 726fi
666if test x$support_keepscrolling = xno; then 727if test x$support_keepscrolling = xno; then
667 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) 728 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
668fi 729fi
669if test x$support_selectionscrolling = xyes; then 730if test x$support_selectionscrolling = xyes; then
… …
792if test x$RESFALLBACK != x; then 853if test x$RESFALLBACK != x; then
793 echo " resource class fallback: $RESFALLBACK" 854 echo " resource class fallback: $RESFALLBACK"
794fi 855fi
795echo 856echo
796echo " embedded perl: $support_perl" 857echo " embedded perl: $support_perl"
797echo " libafterimage: $support_afterimage" 858echo " image library: $image_lib"
798echo 859echo
799if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then 860if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then
800 echo ".----------------------------------------------------------------." 861 echo ".----------------------------------------------------------------."
801 echo ". WARNING: --enable-xim was specified however the locale support ." 862 echo ". WARNING: --enable-xim was specified however the locale support ."
802 echo ". functions could not be found. ." 863 echo ". functions could not be found. ."

Diff Legend

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