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.121 by sf-exg, Mon Nov 29 12:33:21 2010 UTC vs.
Revision 1.131 by sf-exg, Tue Dec 13 19:13:27 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)
… …
460fi 472fi
461 473
462AC_SUBST(PIXBUF_CFLAGS) 474AC_SUBST(PIXBUF_CFLAGS)
463AC_SUBST(PIXBUF_LIBS) 475AC_SUBST(PIXBUF_LIBS)
464 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)
500
465AFTERIMAGE_CFLAGS= 501AFTERIMAGE_CFLAGS=
466AFTERIMAGE_LIBS= 502AFTERIMAGE_LIBS=
467AFTERIMAGE_VERSION=
468 503
469if test x$support_afterimage = xyes; then 504if test x$support_afterimage = xyes; then
470 support_afterimage=no 505 support_afterimage=no
471 506
472 if test "x$afterimage_config" = "x" ; then 507 if test "x$afterimage_config" = "x" ; then
473 AC_PATH_PROG(afterimage_config, afterimage-config, no) 508 AC_PATH_PROG(afterimage_config, afterimage-config, no)
474 fi 509 fi
475 if test "x$afterimage_config" != "xno" ; then 510 if test "x$afterimage_config" != "xno" ; then
476 AC_MSG_CHECKING(for libAfterImage version >= 1.15) 511 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
477 xAFTERIMAGE_VERSION=`$afterimage_config --version` 512 AFTERIMAGE_VERSION=`$afterimage_config --version`
478 if test -n "$xAFTERIMAGE_VERSION" ; then 513 if test -n "$AFTERIMAGE_VERSION" ; then
479 xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 514 AFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
480 xAFTERIMAGE_LIBS=`$afterimage_config --libs` 515 AFTERIMAGE_LIBS=`$afterimage_config --libs`
481 if test "x$xAFTERIMAGE_LIBS" != "x"; then 516 if test "x$AFTERIMAGE_LIBS" != "x"; then
482 libai_ver_major=`echo $xAFTERIMAGE_VERSION | cut -f 1 -d .` 517 libai_ver_major=`echo $AFTERIMAGE_VERSION | cut -f 1 -d .`
483 libai_ver_minor=`echo $xAFTERIMAGE_VERSION | cut -f 2 -d .` 518 libai_ver_minor=`echo $AFTERIMAGE_VERSION | cut -f 2 -d .`
484 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then 519 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then
485 support_afterimage=yes 520 support_afterimage=yes
486 AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS"
487 AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS"
488 AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION"
489 fi 521 fi
490 fi 522 fi
491 fi 523 fi
492 if test "x$support_afterimage" = "xyes"; then 524 if test "x$support_afterimage" = "xyes"; then
493 AC_MSG_RESULT($AFTERIMAGE_LIBS) 525 AC_MSG_RESULT($AFTERIMAGE_LIBS)
494 image_lib=libafterimage 526 image_lib=libafterimage
495 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing) 527 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
496 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.) 528 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
497 else 529 else
498 AC_MSG_RESULT(no) 530 AC_MSG_RESULT(no)
531 AFTERIMAGE_CFLAGS=
532 AFTERIMAGE_LIBS=
499 fi 533 fi
500 fi 534 fi
501fi 535fi
502 536
503AC_SUBST(AFTERIMAGE_CFLAGS) 537AC_SUBST(AFTERIMAGE_CFLAGS)
… …
513 sys/strredir.h \ 547 sys/strredir.h \
514 stdint.h \ 548 stdint.h \
515 wchar.h \ 549 wchar.h \
516 cwchar \ 550 cwchar \
517) 551)
518
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 552
525AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access, 553AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
526[AC_COMPILE_IFELSE( 554[AC_COMPILE_IFELSE(
527 [AC_LANG_PROGRAM([ 555 [AC_LANG_PROGRAM([
528#define XLIB_ILLEGAL_ACCESS 556#define XLIB_ILLEGAL_ACCESS
… …
566save_CFLAGS=$CFLAGS 594save_CFLAGS=$CFLAGS
567CFLAGS="$CFLAGS $X_CFLAGS" 595CFLAGS="$CFLAGS $X_CFLAGS"
568LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 596LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
569if test x$support_xim = xyes; then 597if test x$support_xim = xyes; then
570 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 598 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
571 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 599 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
600 #include <X11/Xlib.h>
572 #include <stdlib.h> 601 #include <stdlib.h>
573 main() { 602 int main() {
574 char *p; 603 char *p;
575 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 604 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
576 exit (XSupportsLocale() ? 0 : 1); 605 exit (XSupportsLocale() ? 0 : 1);
577 else 606 else
578 exit (1);}]])],[dnl 607 exit (1);
608 }
579 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 609 ]])],[rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[:])])
580 :])])
581 if test x$rxvt_cv_func_xlocale = xyes; then 610 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) 611 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, 612 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
584 [AC_COMPILE_IFELSE([ 613 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
585 #include <X11/Xlib.h> 614 #include <X11/Xlib.h>
586 615
587 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); 616 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
588 617
589 void f() { 618 void f() {
590 XIMCallback cb; 619 XIMCallback cb;
591 cb.callback = im_destroy_cb; 620 cb.callback = im_destroy_cb;
592 } 621 }
593 ],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)]) 622 ]])],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
594 623
595 if test x$rxvt_cv_broken_ximcb = xyes; then 624 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.) 625 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
597 fi 626 fi
598 fi 627 fi

Diff Legend

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