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.132 by sf-exg, Wed Dec 14 12:03:04 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_afterimage=yes 98support_pixbuf=yes
99support_startup_notification=yes
99support_xft=yes 100support_xft=yes
100support_unicode3=no 101support_unicode3=no
101support_combining=yes 102support_combining=yes
102support_8bitctrls=no 103support_8bitctrls=no
103support_iso14755=yes 104support_iso14755=yes
… …
128 support_scroll_next=no 129 support_scroll_next=no
129 support_scroll_xterm=no 130 support_scroll_xterm=no
130 support_utmp=no 131 support_utmp=no
131 support_wtmp=no 132 support_wtmp=no
132 support_xim=no 133 support_xim=no
133 support_afterimage=no 134 support_pixbuf=no
135 support_startup_notification=no
134 support_xft=no 136 support_xft=no
135 support_unicode3=no 137 support_unicode3=no
136 support_combining=no 138 support_combining=no
137 support_8bitctrls=no 139 support_8bitctrls=no
138 support_iso14755=no 140 support_iso14755=no
… …
155 support_scroll_next=yes 157 support_scroll_next=yes
156 support_scroll_xterm=yes 158 support_scroll_xterm=yes
157 support_utmp=yes 159 support_utmp=yes
158 support_wtmp=yes 160 support_wtmp=yes
159 support_xim=yes 161 support_xim=yes
160 support_afterimage=yes 162 support_pixbuf=yes
163 support_startup_notification=yes
161 support_xft=yes 164 support_xft=yes
162 support_unicode3=yes 165 support_unicode3=yes
163 support_combining=yes 166 support_combining=yes
164 #support_8bitctrls=yes 167 #support_8bitctrls=yes
165 support_iso14755=yes 168 support_iso14755=yes
… …
228 [if test x$enableval = xyes -o x$enableval = xno; then 231 [if test x$enableval = xyes -o x$enableval = xno; then
229 support_styles=$enableval 232 support_styles=$enableval
230 fi]) 233 fi])
231 234
232AC_ARG_ENABLE(afterimage, 235AC_ARG_ENABLE(afterimage,
233 [ --enable-afterimage enable integration with libAfterImage for background images], 236 [ --enable-afterimage enable integration with libAfterImage for background images (deprecated)],
234 [if test x$enableval = xyes -o x$enableval = xno; then 237 [if test x$enableval = xyes -o x$enableval = xno; then
235 support_afterimage=$enableval 238 support_afterimage=$enableval
236 fi]) 239 fi])
237 240
238AC_ARG_WITH(afterimage_config, 241AC_ARG_WITH(afterimage_config,
… …
243 246
244AC_ARG_ENABLE(pixbuf, 247AC_ARG_ENABLE(pixbuf,
245 [ --enable-pixbuf enable integration with gdk-pixbuf for background images], 248 [ --enable-pixbuf enable integration with gdk-pixbuf for background images],
246 [if test x$enableval = xyes -o x$enableval = xno; then 249 [if test x$enableval = xyes -o x$enableval = xno; then
247 support_pixbuf=$enableval 250 support_pixbuf=$enableval
251 fi])
252
253AC_ARG_ENABLE(startup-notification,
254 [ --enable-startup-notification enable freedesktop startup notification support],
255 [if test x$enableval = xyes -o x$enableval = xno; then
256 support_startup_notification=$enableval
248 fi]) 257 fi])
249 258
250AC_ARG_ENABLE(transparency, 259AC_ARG_ENABLE(transparency,
251 [ --enable-transparency enable transparent backgrounds], 260 [ --enable-transparency enable transparent backgrounds],
252 [if test x$enableval = xyes -o x$enableval = xno; then 261 [if test x$enableval = xyes -o x$enableval = xno; then
… …
440 449
441if test x$support_pixbuf = xyes; then 450if test x$support_pixbuf = xyes; then
442 support_pixbuf=no 451 support_pixbuf=no
443 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 452 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
444 AC_MSG_CHECKING(for gdk-pixbuf) 453 AC_MSG_CHECKING(for gdk-pixbuf)
445 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-xlib-2.0; then 454 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then
446 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --cflags`" 455 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
447 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --libs`" 456 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
448 support_pixbuf=yes 457 support_pixbuf=yes
449 fi 458 fi
450 459
451 if test x$support_pixbuf = xyes; then 460 if test x$support_pixbuf = xyes; then
452 AC_MSG_RESULT(ok) 461 AC_MSG_RESULT(ok)
… …
460fi 469fi
461 470
462AC_SUBST(PIXBUF_CFLAGS) 471AC_SUBST(PIXBUF_CFLAGS)
463AC_SUBST(PIXBUF_LIBS) 472AC_SUBST(PIXBUF_LIBS)
464 473
474STARTUP_NOTIFICATION_CFLAGS=
475STARTUP_NOTIFICATION_LIBS=
476
477if test x$support_startup_notification = xyes; then
478 support_startup_notification=no
479 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
480 AC_MSG_CHECKING(for libstartup-notification)
481 if test $PKG_CONFIG != no && $PKG_CONFIG --exists libstartup-notification-1.0; then
482 STARTUP_NOTIFICATION_CFLAGS="`$PKG_CONFIG libstartup-notification-1.0 --cflags`"
483 STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG libstartup-notification-1.0 --libs`"
484 support_startup_notification=yes
485 fi
486
487 if test x$support_startup_notification = xyes; then
488 AC_MSG_RESULT(ok)
489 AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, Define if freedesktop startup notifications should be supported)
490 else
491 AC_MSG_RESULT(no)
492 fi
493fi
494
495AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
496AC_SUBST(STARTUP_NOTIFICATION_LIBS)
497
465AFTERIMAGE_CFLAGS= 498AFTERIMAGE_CFLAGS=
466AFTERIMAGE_LIBS= 499AFTERIMAGE_LIBS=
467AFTERIMAGE_VERSION=
468 500
469if test x$support_afterimage = xyes; then 501if test x$support_afterimage = xyes; then
470 support_afterimage=no 502 support_afterimage=no
471 503
472 if test "x$afterimage_config" = "x" ; then 504 if test "x$afterimage_config" = "x" ; then
473 AC_PATH_PROG(afterimage_config, afterimage-config, no) 505 AC_PATH_PROG(afterimage_config, afterimage-config, no)
474 fi 506 fi
475 if test "x$afterimage_config" != "xno" ; then 507 if test "x$afterimage_config" != "xno" ; then
476 AC_MSG_CHECKING(for libAfterImage version >= 1.15) 508 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
477 xAFTERIMAGE_VERSION=`$afterimage_config --version` 509 AFTERIMAGE_VERSION=`$afterimage_config --version`
478 if test -n "$xAFTERIMAGE_VERSION" ; then 510 if test -n "$AFTERIMAGE_VERSION" ; then
479 xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 511 AFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
480 xAFTERIMAGE_LIBS=`$afterimage_config --libs` 512 AFTERIMAGE_LIBS=`$afterimage_config --libs`
481 if test "x$xAFTERIMAGE_LIBS" != "x"; then 513 if test "x$AFTERIMAGE_LIBS" != "x"; then
482 libai_ver_major=`echo $xAFTERIMAGE_VERSION | cut -f 1 -d .` 514 libai_ver_major=`echo $AFTERIMAGE_VERSION | cut -f 1 -d .`
483 libai_ver_minor=`echo $xAFTERIMAGE_VERSION | cut -f 2 -d .` 515 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 516 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then
485 support_afterimage=yes 517 support_afterimage=yes
486 AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS"
487 AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS"
488 AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION"
489 fi 518 fi
490 fi 519 fi
491 fi 520 fi
492 if test "x$support_afterimage" = "xyes"; then 521 if test "x$support_afterimage" = "xyes"; then
493 AC_MSG_RESULT($AFTERIMAGE_LIBS) 522 AC_MSG_RESULT($AFTERIMAGE_LIBS)
494 image_lib=libafterimage 523 image_lib=libafterimage
495 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing) 524 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.) 525 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
497 else 526 else
498 AC_MSG_RESULT(no) 527 AC_MSG_RESULT(no)
528 AFTERIMAGE_CFLAGS=
529 AFTERIMAGE_LIBS=
499 fi 530 fi
500 fi 531 fi
501fi 532fi
502 533
503AC_SUBST(AFTERIMAGE_CFLAGS) 534AC_SUBST(AFTERIMAGE_CFLAGS)
… …
513 sys/strredir.h \ 544 sys/strredir.h \
514 stdint.h \ 545 stdint.h \
515 wchar.h \ 546 wchar.h \
516 cwchar \ 547 cwchar \
517) 548)
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 549
525AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access, 550AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
526[AC_COMPILE_IFELSE( 551[AC_COMPILE_IFELSE(
527 [AC_LANG_PROGRAM([ 552 [AC_LANG_PROGRAM([
528#define XLIB_ILLEGAL_ACCESS 553#define XLIB_ILLEGAL_ACCESS
… …
566save_CFLAGS=$CFLAGS 591save_CFLAGS=$CFLAGS
567CFLAGS="$CFLAGS $X_CFLAGS" 592CFLAGS="$CFLAGS $X_CFLAGS"
568LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 593LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
569if test x$support_xim = xyes; then 594if test x$support_xim = xyes; then
570 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 595 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
571 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 596 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
597 #include <X11/Xlib.h>
572 #include <stdlib.h> 598 #include <stdlib.h>
573 main() { 599 int main() {
574 char *p; 600 char *p;
575 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 601 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
576 exit (XSupportsLocale() ? 0 : 1); 602 exit (XSupportsLocale() ? 0 : 1);
577 else 603 else
578 exit (1);}]])],[dnl 604 exit (1);
605 }
579 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 606 ]])],[rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[:])])
580 :])])
581 if test x$rxvt_cv_func_xlocale = xyes; then 607 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) 608 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, 609 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
584 [AC_COMPILE_IFELSE([ 610 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
585 #include <X11/Xlib.h> 611 #include <X11/Xlib.h>
586 612
587 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); 613 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
588 614
589 void f() { 615 void f() {
590 XIMCallback cb; 616 XIMCallback cb;
591 cb.callback = im_destroy_cb; 617 cb.callback = im_destroy_cb;
592 } 618 }
593 ],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)]) 619 ]])],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
594 620
595 if test x$rxvt_cv_broken_ximcb = xyes; then 621 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.) 622 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
597 fi 623 fi
598 fi 624 fi

Diff Legend

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