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.128 by sf-exg, Wed Jan 5 17:41:24 2011 UTC vs.
Revision 1.132 by sf-exg, Wed Dec 14 12:03:04 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_afterimage=yes 99support_startup_notification=yes
100support_xft=yes 100support_xft=yes
101support_unicode3=no 101support_unicode3=no
102support_combining=yes 102support_combining=yes
103support_8bitctrls=no 103support_8bitctrls=no
104support_iso14755=yes 104support_iso14755=yes
… …
130 support_scroll_xterm=no 130 support_scroll_xterm=no
131 support_utmp=no 131 support_utmp=no
132 support_wtmp=no 132 support_wtmp=no
133 support_xim=no 133 support_xim=no
134 support_pixbuf=no 134 support_pixbuf=no
135 support_afterimage=no 135 support_startup_notification=no
136 support_xft=no 136 support_xft=no
137 support_unicode3=no 137 support_unicode3=no
138 support_combining=no 138 support_combining=no
139 support_8bitctrls=no 139 support_8bitctrls=no
140 support_iso14755=no 140 support_iso14755=no
… …
158 support_scroll_xterm=yes 158 support_scroll_xterm=yes
159 support_utmp=yes 159 support_utmp=yes
160 support_wtmp=yes 160 support_wtmp=yes
161 support_xim=yes 161 support_xim=yes
162 support_pixbuf=yes 162 support_pixbuf=yes
163 support_afterimage=yes 163 support_startup_notification=yes
164 support_xft=yes 164 support_xft=yes
165 support_unicode3=yes 165 support_unicode3=yes
166 support_combining=yes 166 support_combining=yes
167 #support_8bitctrls=yes 167 #support_8bitctrls=yes
168 support_iso14755=yes 168 support_iso14755=yes
… …
231 [if test x$enableval = xyes -o x$enableval = xno; then 231 [if test x$enableval = xyes -o x$enableval = xno; then
232 support_styles=$enableval 232 support_styles=$enableval
233 fi]) 233 fi])
234 234
235AC_ARG_ENABLE(afterimage, 235AC_ARG_ENABLE(afterimage,
236 [ --enable-afterimage enable integration with libAfterImage for background images], 236 [ --enable-afterimage enable integration with libAfterImage for background images (deprecated)],
237 [if test x$enableval = xyes -o x$enableval = xno; then 237 [if test x$enableval = xyes -o x$enableval = xno; then
238 support_afterimage=$enableval 238 support_afterimage=$enableval
239 fi]) 239 fi])
240 240
241AC_ARG_WITH(afterimage_config, 241AC_ARG_WITH(afterimage_config,
… …
246 246
247AC_ARG_ENABLE(pixbuf, 247AC_ARG_ENABLE(pixbuf,
248 [ --enable-pixbuf enable integration with gdk-pixbuf for background images], 248 [ --enable-pixbuf enable integration with gdk-pixbuf for background images],
249 [if test x$enableval = xyes -o x$enableval = xno; then 249 [if test x$enableval = xyes -o x$enableval = xno; then
250 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
251 fi]) 257 fi])
252 258
253AC_ARG_ENABLE(transparency, 259AC_ARG_ENABLE(transparency,
254 [ --enable-transparency enable transparent backgrounds], 260 [ --enable-transparency enable transparent backgrounds],
255 [if test x$enableval = xyes -o x$enableval = xno; then 261 [if test x$enableval = xyes -o x$enableval = xno; then
… …
463fi 469fi
464 470
465AC_SUBST(PIXBUF_CFLAGS) 471AC_SUBST(PIXBUF_CFLAGS)
466AC_SUBST(PIXBUF_LIBS) 472AC_SUBST(PIXBUF_LIBS)
467 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
468AFTERIMAGE_CFLAGS= 498AFTERIMAGE_CFLAGS=
469AFTERIMAGE_LIBS= 499AFTERIMAGE_LIBS=
470AFTERIMAGE_VERSION=
471 500
472if test x$support_afterimage = xyes; then 501if test x$support_afterimage = xyes; then
473 support_afterimage=no 502 support_afterimage=no
474 503
475 if test "x$afterimage_config" = "x" ; then 504 if test "x$afterimage_config" = "x" ; then
476 AC_PATH_PROG(afterimage_config, afterimage-config, no) 505 AC_PATH_PROG(afterimage_config, afterimage-config, no)
477 fi 506 fi
478 if test "x$afterimage_config" != "xno" ; then 507 if test "x$afterimage_config" != "xno" ; then
479 AC_MSG_CHECKING(for libAfterImage version >= 1.15) 508 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
480 xAFTERIMAGE_VERSION=`$afterimage_config --version` 509 AFTERIMAGE_VERSION=`$afterimage_config --version`
481 if test -n "$xAFTERIMAGE_VERSION" ; then 510 if test -n "$AFTERIMAGE_VERSION" ; then
482 xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 511 AFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
483 xAFTERIMAGE_LIBS=`$afterimage_config --libs` 512 AFTERIMAGE_LIBS=`$afterimage_config --libs`
484 if test "x$xAFTERIMAGE_LIBS" != "x"; then 513 if test "x$AFTERIMAGE_LIBS" != "x"; then
485 libai_ver_major=`echo $xAFTERIMAGE_VERSION | cut -f 1 -d .` 514 libai_ver_major=`echo $AFTERIMAGE_VERSION | cut -f 1 -d .`
486 libai_ver_minor=`echo $xAFTERIMAGE_VERSION | cut -f 2 -d .` 515 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 516 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then
488 support_afterimage=yes 517 support_afterimage=yes
489 AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS"
490 AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS"
491 AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION"
492 fi 518 fi
493 fi 519 fi
494 fi 520 fi
495 if test "x$support_afterimage" = "xyes"; then 521 if test "x$support_afterimage" = "xyes"; then
496 AC_MSG_RESULT($AFTERIMAGE_LIBS) 522 AC_MSG_RESULT($AFTERIMAGE_LIBS)
497 image_lib=libafterimage 523 image_lib=libafterimage
498 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)
499 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.)
500 else 526 else
501 AC_MSG_RESULT(no) 527 AC_MSG_RESULT(no)
528 AFTERIMAGE_CFLAGS=
529 AFTERIMAGE_LIBS=
502 fi 530 fi
503 fi 531 fi
504fi 532fi
505 533
506AC_SUBST(AFTERIMAGE_CFLAGS) 534AC_SUBST(AFTERIMAGE_CFLAGS)
… …
563save_CFLAGS=$CFLAGS 591save_CFLAGS=$CFLAGS
564CFLAGS="$CFLAGS $X_CFLAGS" 592CFLAGS="$CFLAGS $X_CFLAGS"
565LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 593LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
566if test x$support_xim = xyes; then 594if test x$support_xim = xyes; then
567 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 595 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
568 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 596 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
597 #include <X11/Xlib.h>
569 #include <stdlib.h> 598 #include <stdlib.h>
570 int main() { 599 int main() {
571 char *p; 600 char *p;
572 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 601 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
573 exit (XSupportsLocale() ? 0 : 1); 602 exit (XSupportsLocale() ? 0 : 1);
574 else 603 else
575 exit (1);}]])],[dnl 604 exit (1);
605 }
576 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 606 ]])],[rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[:])])
577 :])])
578 if test x$rxvt_cv_func_xlocale = xyes; then 607 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) 608 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, 609 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
581 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ 610 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
582 #include <X11/Xlib.h> 611 #include <X11/Xlib.h>

Diff Legend

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