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.126 by sf-exg, Tue Jan 4 23:12:10 2011 UTC vs.
Revision 1.131 by sf-exg, Tue Dec 13 19:13:27 2011 UTC

… …
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 98support_pixbuf=yes
99support_startup_notification=yes
99support_afterimage=yes 100support_afterimage=yes
100support_xft=yes 101support_xft=yes
101support_unicode3=no 102support_unicode3=no
102support_combining=yes 103support_combining=yes
103support_8bitctrls=no 104support_8bitctrls=no
… …
130 support_scroll_xterm=no 131 support_scroll_xterm=no
131 support_utmp=no 132 support_utmp=no
132 support_wtmp=no 133 support_wtmp=no
133 support_xim=no 134 support_xim=no
134 support_pixbuf=no 135 support_pixbuf=no
136 support_startup_notification=no
135 support_afterimage=no 137 support_afterimage=no
136 support_xft=no 138 support_xft=no
137 support_unicode3=no 139 support_unicode3=no
138 support_combining=no 140 support_combining=no
139 support_8bitctrls=no 141 support_8bitctrls=no
… …
158 support_scroll_xterm=yes 160 support_scroll_xterm=yes
159 support_utmp=yes 161 support_utmp=yes
160 support_wtmp=yes 162 support_wtmp=yes
161 support_xim=yes 163 support_xim=yes
162 support_pixbuf=yes 164 support_pixbuf=yes
165 support_startup_notification=yes
163 support_afterimage=yes 166 support_afterimage=yes
164 support_xft=yes 167 support_xft=yes
165 support_unicode3=yes 168 support_unicode3=yes
166 support_combining=yes 169 support_combining=yes
167 #support_8bitctrls=yes 170 #support_8bitctrls=yes
… …
248 [ --enable-pixbuf enable integration with gdk-pixbuf for background images], 251 [ --enable-pixbuf enable integration with gdk-pixbuf for background images],
249 [if test x$enableval = xyes -o x$enableval = xno; then 252 [if test x$enableval = xyes -o x$enableval = xno; then
250 support_pixbuf=$enableval 253 support_pixbuf=$enableval
251 fi]) 254 fi])
252 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
253AC_ARG_ENABLE(transparency, 262AC_ARG_ENABLE(transparency,
254 [ --enable-transparency enable transparent backgrounds], 263 [ --enable-transparency enable transparent backgrounds],
255 [if test x$enableval = xyes -o x$enableval = xno; then 264 [if test x$enableval = xyes -o x$enableval = xno; then
256 support_inheritpixmap=$enableval 265 support_inheritpixmap=$enableval
257 fi]) 266 fi])
… …
463fi 472fi
464 473
465AC_SUBST(PIXBUF_CFLAGS) 474AC_SUBST(PIXBUF_CFLAGS)
466AC_SUBST(PIXBUF_LIBS) 475AC_SUBST(PIXBUF_LIBS)
467 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
468AFTERIMAGE_CFLAGS= 501AFTERIMAGE_CFLAGS=
469AFTERIMAGE_LIBS= 502AFTERIMAGE_LIBS=
470AFTERIMAGE_VERSION=
471 503
472if test x$support_afterimage = xyes; then 504if test x$support_afterimage = xyes; then
473 support_afterimage=no 505 support_afterimage=no
474 506
475 if test "x$afterimage_config" = "x" ; then 507 if test "x$afterimage_config" = "x" ; then
476 AC_PATH_PROG(afterimage_config, afterimage-config, no) 508 AC_PATH_PROG(afterimage_config, afterimage-config, no)
477 fi 509 fi
478 if test "x$afterimage_config" != "xno" ; then 510 if test "x$afterimage_config" != "xno" ; then
479 AC_MSG_CHECKING(for libAfterImage version >= 1.15) 511 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
480 xAFTERIMAGE_VERSION=`$afterimage_config --version` 512 AFTERIMAGE_VERSION=`$afterimage_config --version`
481 if test -n "$xAFTERIMAGE_VERSION" ; then 513 if test -n "$AFTERIMAGE_VERSION" ; then
482 xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 514 AFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
483 xAFTERIMAGE_LIBS=`$afterimage_config --libs` 515 AFTERIMAGE_LIBS=`$afterimage_config --libs`
484 if test "x$xAFTERIMAGE_LIBS" != "x"; then 516 if test "x$AFTERIMAGE_LIBS" != "x"; then
485 libai_ver_major=`echo $xAFTERIMAGE_VERSION | cut -f 1 -d .` 517 libai_ver_major=`echo $AFTERIMAGE_VERSION | cut -f 1 -d .`
486 libai_ver_minor=`echo $xAFTERIMAGE_VERSION | cut -f 2 -d .` 518 libai_ver_minor=`echo $AFTERIMAGE_VERSION | cut -f 2 -d .`
487 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
488 support_afterimage=yes 520 support_afterimage=yes
489 AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS"
490 AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS"
491 AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION"
492 fi 521 fi
493 fi 522 fi
494 fi 523 fi
495 if test "x$support_afterimage" = "xyes"; then 524 if test "x$support_afterimage" = "xyes"; then
496 AC_MSG_RESULT($AFTERIMAGE_LIBS) 525 AC_MSG_RESULT($AFTERIMAGE_LIBS)
497 image_lib=libafterimage 526 image_lib=libafterimage
498 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)
499 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.)
500 else 529 else
501 AC_MSG_RESULT(no) 530 AC_MSG_RESULT(no)
531 AFTERIMAGE_CFLAGS=
532 AFTERIMAGE_LIBS=
502 fi 533 fi
503 fi 534 fi
504fi 535fi
505 536
506AC_SUBST(AFTERIMAGE_CFLAGS) 537AC_SUBST(AFTERIMAGE_CFLAGS)
… …
563save_CFLAGS=$CFLAGS 594save_CFLAGS=$CFLAGS
564CFLAGS="$CFLAGS $X_CFLAGS" 595CFLAGS="$CFLAGS $X_CFLAGS"
565LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 596LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
566if test x$support_xim = xyes; then 597if test x$support_xim = xyes; then
567 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 598 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
568 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 599 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
600 #include <X11/Xlib.h>
569 #include <stdlib.h> 601 #include <stdlib.h>
570 main() { 602 int main() {
571 char *p; 603 char *p;
572 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 604 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
573 exit (XSupportsLocale() ? 0 : 1); 605 exit (XSupportsLocale() ? 0 : 1);
574 else 606 else
575 exit (1);}]])],[dnl 607 exit (1);
608 }
576 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 609 ]])],[rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[:])])
577 :])])
578 if test x$rxvt_cv_func_xlocale = xyes; then 610 if test x$rxvt_cv_func_xlocale = xyes; then
579 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)
580 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb, 612 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
581 [AC_COMPILE_IFELSE([ 613 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
582 #include <X11/Xlib.h> 614 #include <X11/Xlib.h>
583 615
584 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); 616 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
585 617
586 void f() { 618 void f() {
587 XIMCallback cb; 619 XIMCallback cb;
588 cb.callback = im_destroy_cb; 620 cb.callback = im_destroy_cb;
589 } 621 }
590 ],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)]) 622 ]])],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
591 623
592 if test x$rxvt_cv_broken_ximcb = xyes; then 624 if test x$rxvt_cv_broken_ximcb = xyes; then
593 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.)
594 fi 626 fi
595 fi 627 fi

Diff Legend

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