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.123 by root, Mon Jan 3 03:05:47 2011 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])
… …
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
… …
505 541
506dnl# -------------------------------------------------------------------------- 542dnl# --------------------------------------------------------------------------
507dnl# CHECKING FOR HEADER FILES 543dnl# CHECKING FOR HEADER FILES
508dnl# -------------------------------------------------------------------------- 544dnl# --------------------------------------------------------------------------
509AC_CHECK_HEADERS( \ 545AC_CHECK_HEADERS( \
546 sys/byteorder.h \
510 sys/ioctl.h \ 547 sys/ioctl.h \
511 sys/sockio.h \ 548 sys/sockio.h \
512 sys/strredir.h \ 549 sys/strredir.h \
513 stdint.h \ 550 stdint.h \
514 wchar.h \ 551 wchar.h \
515 cwchar \ 552 cwchar \
516) 553)
517
518AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
519[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
520if test x$rxvt_cv_xpointer = xyes; then
521 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
522fi
523 554
524AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access, 555AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
525[AC_COMPILE_IFELSE( 556[AC_COMPILE_IFELSE(
526 [AC_LANG_PROGRAM([ 557 [AC_LANG_PROGRAM([
527#define XLIB_ILLEGAL_ACCESS 558#define XLIB_ILLEGAL_ACCESS
… …
565save_CFLAGS=$CFLAGS 596save_CFLAGS=$CFLAGS
566CFLAGS="$CFLAGS $X_CFLAGS" 597CFLAGS="$CFLAGS $X_CFLAGS"
567LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 598LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
568if test x$support_xim = xyes; then 599if test x$support_xim = xyes; then
569 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 600 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
570 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 601 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
602 #include <X11/Xlib.h>
571 #include <stdlib.h> 603 #include <stdlib.h>
572 main() { 604 int main() {
573 char *p; 605 char *p;
574 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 606 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
575 exit (XSupportsLocale() ? 0 : 1); 607 exit (XSupportsLocale() ? 0 : 1);
576 else 608 else
577 exit (1);}]])],[dnl 609 exit (1);
610 }
578 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 611 ]])],[rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[:])])
579 :])])
580 if test x$rxvt_cv_func_xlocale = xyes; then 612 if test x$rxvt_cv_func_xlocale = xyes; then
581 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)
582 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb, 614 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
583 [AC_COMPILE_IFELSE([ 615 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
584 #include <X11/Xlib.h> 616 #include <X11/Xlib.h>
585 617
586 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); 618 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
587 619
588 void f() { 620 void f() {
589 XIMCallback cb; 621 XIMCallback cb;
590 cb.callback = im_destroy_cb; 622 cb.callback = im_destroy_cb;
591 } 623 }
592 ],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)]) 624 ]])],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
593 625
594 if test x$rxvt_cv_broken_ximcb = xyes; then 626 if test x$rxvt_cv_broken_ximcb = xyes; then
595 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.)
596 fi 628 fi
597 fi 629 fi

Diff Legend

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