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.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])
… …
440 452
441if test x$support_pixbuf = xyes; then 453if test x$support_pixbuf = xyes; then
442 support_pixbuf=no 454 support_pixbuf=no
443 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 455 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
444 AC_MSG_CHECKING(for gdk-pixbuf) 456 AC_MSG_CHECKING(for gdk-pixbuf)
445 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
446 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --cflags`" 458 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
447 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --libs`" 459 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
448 support_pixbuf=yes 460 support_pixbuf=yes
449 fi 461 fi
450 462
451 if test x$support_pixbuf = xyes; then 463 if test x$support_pixbuf = xyes; then
452 AC_MSG_RESULT(ok) 464 AC_MSG_RESULT(ok)
… …
459 fi 471 fi
460fi 472fi
461 473
462AC_SUBST(PIXBUF_CFLAGS) 474AC_SUBST(PIXBUF_CFLAGS)
463AC_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)
464 500
465AFTERIMAGE_CFLAGS= 501AFTERIMAGE_CFLAGS=
466AFTERIMAGE_LIBS= 502AFTERIMAGE_LIBS=
467AFTERIMAGE_VERSION= 503AFTERIMAGE_VERSION=
468 504
… …
514 stdint.h \ 550 stdint.h \
515 wchar.h \ 551 wchar.h \
516 cwchar \ 552 cwchar \
517) 553)
518 554
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, 555AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
526[AC_COMPILE_IFELSE( 556[AC_COMPILE_IFELSE(
527 [AC_LANG_PROGRAM([ 557 [AC_LANG_PROGRAM([
528#define XLIB_ILLEGAL_ACCESS 558#define XLIB_ILLEGAL_ACCESS
529#include <X11/Xlib.h> 559#include <X11/Xlib.h>
… …
566save_CFLAGS=$CFLAGS 596save_CFLAGS=$CFLAGS
567CFLAGS="$CFLAGS $X_CFLAGS" 597CFLAGS="$CFLAGS $X_CFLAGS"
568LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 598LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
569if test x$support_xim = xyes; then 599if test x$support_xim = xyes; then
570 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 600 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
571 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 601 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
602 #include <X11/Xlib.h>
572 #include <stdlib.h> 603 #include <stdlib.h>
573 main() { 604 int main() {
574 char *p; 605 char *p;
575 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 606 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
576 exit (XSupportsLocale() ? 0 : 1); 607 exit (XSupportsLocale() ? 0 : 1);
577 else 608 else
578 exit (1);}]])],[dnl 609 exit (1);
610 }
579 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 611 ]])],[rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[:])])
580 :])])
581 if test x$rxvt_cv_func_xlocale = xyes; then 612 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) 613 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, 614 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
584 [AC_COMPILE_IFELSE([ 615 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
585 #include <X11/Xlib.h> 616 #include <X11/Xlib.h>
586 617
587 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); 618 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
588 619
589 void f() { 620 void f() {
590 XIMCallback cb; 621 XIMCallback cb;
591 cb.callback = im_destroy_cb; 622 cb.callback = im_destroy_cb;
592 } 623 }
593 ],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)]) 624 ]])],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
594 625
595 if test x$rxvt_cv_broken_ximcb = xyes; then 626 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.) 627 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
597 fi 628 fi
598 fi 629 fi
… …
626TTY_GROUP_CHECK 657TTY_GROUP_CHECK
627 658
628dnl# -------------------------------------------------------------------------- 659dnl# --------------------------------------------------------------------------
629dnl# now add and remove other stuff 660dnl# now add and remove other stuff
630dnl# -------------------------------------------------------------------------- 661dnl# --------------------------------------------------------------------------
631if 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
632 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 679 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
633 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 680 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
634 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 681 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
635 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 682 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
636 else 683 else
… …
639 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 686 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
640 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 687 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
641 fi 688 fi
642 fi 689 fi
643 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
644 save_LIBS="$LIBS" 696 save_LIBS="$LIBS"
645 LIBS="$LIBS $X_LIBS" 697 LIBS="$LIBS $X_LIBS"
646 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 698 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
647 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])
648 LIBS="$save_LIBS" 702 LIBS="$save_LIBS"
649 703
650 if test x$support_xft = xyes; then 704 if test x$support_xft = xyes; then
651 AC_DEFINE(XFT, 1, Define to enable xft support) 705 AC_DEFINE(XFT, 1, Define to enable xft support)
652 fi 706 fi
653fi 707fi
708if test x$support_styles = xyes; then
709 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
710fi
711if test x$support_iso14755 = xyes; then
712 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
713fi
714if test x$support_8bitctrls = xyes; then
715 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
716fi
717if test x$support_fading = xyes; then
718 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
719fi
654if test x$support_inheritpixmap = xyes; then 720if 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 721 if test x$rxvt_have_xrender = xyes; then
669 LIBS="$LIBS -lm" 722 LIBS="$LIBS -lm"
670 AC_DEFINE(XRENDER, 1, Define to enable xrender support) 723 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
671 fi 724 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) 725 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
687fi 726fi
688if test x$support_keepscrolling = xno; then 727if 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) 728 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
690fi 729fi

Diff Legend

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