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.125 by sf-exg, Tue Jan 4 10:01:53 2011 UTC vs.
Revision 1.129 by sf-exg, Sat Jan 8 17:30:46 2011 UTC

… …
517 stdint.h \ 517 stdint.h \
518 wchar.h \ 518 wchar.h \
519 cwchar \ 519 cwchar \
520) 520)
521 521
522AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
523[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
524if test x$rxvt_cv_xpointer = xyes; then
525 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
526fi
527
528AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access, 522AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
529[AC_COMPILE_IFELSE( 523[AC_COMPILE_IFELSE(
530 [AC_LANG_PROGRAM([ 524 [AC_LANG_PROGRAM([
531#define XLIB_ILLEGAL_ACCESS 525#define XLIB_ILLEGAL_ACCESS
532#include <X11/Xlib.h> 526#include <X11/Xlib.h>
… …
569save_CFLAGS=$CFLAGS 563save_CFLAGS=$CFLAGS
570CFLAGS="$CFLAGS $X_CFLAGS" 564CFLAGS="$CFLAGS $X_CFLAGS"
571LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 565LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
572if test x$support_xim = xyes; then 566if test x$support_xim = xyes; then
573 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 567 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
574 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 568 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
569 #include <X11/Xlib.h>
575 #include <stdlib.h> 570 #include <stdlib.h>
576 main() { 571 int main() {
577 char *p; 572 char *p;
578 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 573 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
579 exit (XSupportsLocale() ? 0 : 1); 574 exit (XSupportsLocale() ? 0 : 1);
580 else 575 else
581 exit (1);}]])],[dnl 576 exit (1);
577 }
582 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 578 ]])],[rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[:])])
583 :])])
584 if test x$rxvt_cv_func_xlocale = xyes; then 579 if test x$rxvt_cv_func_xlocale = xyes; then
585 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input) 580 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
586 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb, 581 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
587 [AC_COMPILE_IFELSE([ 582 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
588 #include <X11/Xlib.h> 583 #include <X11/Xlib.h>
589 584
590 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); 585 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
591 586
592 void f() { 587 void f() {
593 XIMCallback cb; 588 XIMCallback cb;
594 cb.callback = im_destroy_cb; 589 cb.callback = im_destroy_cb;
595 } 590 }
596 ],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)]) 591 ]])],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
597 592
598 if test x$rxvt_cv_broken_ximcb = xyes; then 593 if test x$rxvt_cv_broken_ximcb = xyes; then
599 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.) 594 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
600 fi 595 fi
601 fi 596 fi

Diff Legend

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