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.117 by sf-exg, Fri Oct 8 18:57:04 2010 UTC vs.
Revision 1.137 by sf-exg, Thu Jan 19 11:08:19 2012 UTC

… …
9 9
10AC_CANONICAL_HOST 10AC_CANONICAL_HOST
11 11
12dnl RXVT version 12dnl RXVT version
13changequote(, )dnl 13changequote(, )dnl
14VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 14VERSION=`sed -n -e 's/^.* VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
15DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 15DATE=`sed -n -e 's/^.* DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
16changequote([, ])dnl 16changequote([, ])dnl
17AC_SUBST(VERSION)dnl 17AC_SUBST(VERSION)dnl
18AC_SUBST(DATE)dnl 18AC_SUBST(DATE)dnl
19 19
20echo "" 20echo ""
… …
32AC_AIX 32AC_AIX
33AC_GNU_SOURCE 33AC_GNU_SOURCE
34AC_ISC_POSIX 34AC_ISC_POSIX
35AC_LANG(C++) 35AC_LANG(C++)
36 36
37LINKER="$CXX"
37dnl check whether we can link with gcc -lsupc++ 38dnl check whether we can link with gcc -lsupc++
38if test x$GCC = xyes && test x$GXX = xyes; then 39if test x$GCC = xyes && test x$GXX = xyes; then
39 dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it 40 dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it
40 AC_MSG_CHECKING([for working libsupc++]) 41 AC_MSG_CHECKING([for working libsupc++])
41 save_CXX="$CXX" 42 save_CXX="$CXX"
42 save_LIBS="$LIBS" 43 save_LIBS="$LIBS"
43 CXX="$CC" 44 CXX="$CC"
44 LIBS="$LIBS -lsupc++" 45 LIBS="$LIBS -lsupc++"
45 LINKER="$CC"
46 AC_LINK_IFELSE( 46 AC_LINK_IFELSE(
47 [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])], 47 [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])],
48 [AC_MSG_RESULT(ok)], 48 [AC_MSG_RESULT(ok)
49 LINKER="$CC"],
49 [ 50 [
50 AC_MSG_RESULT([no, making everything bigger and slower]) 51 AC_MSG_RESULT([no, making everything bigger and slower])
51 LIBS="$save_LIBS" 52 LIBS="$save_LIBS"
52 LINKER="$save_CXX"
53 ] 53 ]
54 ) 54 )
55 CXX="$save_CXX" 55 CXX="$save_CXX"
56fi 56fi
57AC_SUBST(LINKER,[$LINKER]) 57AC_SUBST(LINKER,[$LINKER])
… …
66 else 66 else
67 CXXFLAGS="-O" 67 CXXFLAGS="-O"
68 fi 68 fi
69 CFLAGS="$CXXFLAGS" 69 CFLAGS="$CXXFLAGS"
70fi 70fi
71
72case $host in
73 *-*-solaris* )
74 AC_DEFINE(_XOPEN_SOURCE, 500, Needed to get declarations for msg_control and msg_controllen on Solaris)
75 ;;
76esac
77 71
78dnl# FreeBSD needs to link libxpg4 72dnl# FreeBSD needs to link libxpg4
79AC_SEARCH_LIBS(setlocale, xpg4) 73AC_SEARCH_LIBS(setlocale, xpg4)
80 74
81dnl# solaris needs to link libnsl and socket 75dnl# solaris needs to link libnsl and socket
… …
93support_pointer_blank=yes 87support_pointer_blank=yes
94support_scroll_rxvt=yes 88support_scroll_rxvt=yes
95support_scroll_next=yes 89support_scroll_next=yes
96support_scroll_xterm=yes 90support_scroll_xterm=yes
97support_xim=yes 91support_xim=yes
98support_afterimage=yes 92support_pixbuf=yes
93support_startup_notification=yes
99support_xft=yes 94support_xft=yes
100support_unicode3=no 95support_unicode3=no
101support_combining=yes 96support_combining=yes
102support_8bitctrls=no 97support_8bitctrls=no
103support_iso14755=yes 98support_iso14755=yes
… …
128 support_scroll_next=no 123 support_scroll_next=no
129 support_scroll_xterm=no 124 support_scroll_xterm=no
130 support_utmp=no 125 support_utmp=no
131 support_wtmp=no 126 support_wtmp=no
132 support_xim=no 127 support_xim=no
133 support_afterimage=no 128 support_pixbuf=no
129 support_startup_notification=no
134 support_xft=no 130 support_xft=no
135 support_unicode3=no 131 support_unicode3=no
136 support_combining=no 132 support_combining=no
137 support_8bitctrls=no 133 support_8bitctrls=no
138 support_iso14755=no 134 support_iso14755=no
… …
155 support_scroll_next=yes 151 support_scroll_next=yes
156 support_scroll_xterm=yes 152 support_scroll_xterm=yes
157 support_utmp=yes 153 support_utmp=yes
158 support_wtmp=yes 154 support_wtmp=yes
159 support_xim=yes 155 support_xim=yes
160 support_afterimage=yes 156 support_pixbuf=yes
157 support_startup_notification=yes
161 support_xft=yes 158 support_xft=yes
162 support_unicode3=yes 159 support_unicode3=yes
163 support_combining=yes 160 support_combining=yes
164 #support_8bitctrls=yes 161 #support_8bitctrls=yes
165 support_iso14755=yes 162 support_iso14755=yes
… …
167 support_perl=yes 164 support_perl=yes
168 codesets=all 165 codesets=all
169 fi 166 fi
170 ]) 167 ])
171 168
172ASSERTIONS=no 169support_assertions=no
173AC_ARG_ENABLE(assert, 170AC_ARG_ENABLE(assert,
174 [ --enable-assert enable assertions], 171 [ --enable-assert enable assertions],
175 [if test x$enableval = xyes; then 172 [if test x$enableval = xyes; then
176 ASSERTIONS=yes 173 support_assertions=yes
177 fi]) 174 fi])
178if test x$ASSERTIONS = xno; then 175if test x$support_assertions = xno; then
179 AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging)) 176 AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging))
180fi 177fi
181 178
182WARNINGS=no 179support_warnings=no
183AC_ARG_ENABLE(warnings, 180AC_ARG_ENABLE(warnings,
184 [ --enable-warnings turn on g++ warnings], 181 [ --enable-warnings turn on g++ warnings],
185 [if test x$enableval = xyes; then 182 [if test x$enableval = xyes; then
186 WARNINGS=yes 183 support_warnings=yes
187 fi]) 184 fi])
188if test x$GXX = xyes; then 185if test x$GXX = xyes; then
189 if test $WARNINGS = yes; then 186 if test $support_warnings = yes; then
190 save_CXXFLAGS="$CXXFLAGS" 187 save_CXXFLAGS="$CXXFLAGS"
191 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor" 188 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-unused-value"
192 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"]) 189 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"])
193 else 190 else
194 CXXFLAGS="$CXXFLAGS -w" 191 CXXFLAGS="$CXXFLAGS -w"
195 fi 192 fi
196fi 193fi
… …
228 [if test x$enableval = xyes -o x$enableval = xno; then 225 [if test x$enableval = xyes -o x$enableval = xno; then
229 support_styles=$enableval 226 support_styles=$enableval
230 fi]) 227 fi])
231 228
232AC_ARG_ENABLE(afterimage, 229AC_ARG_ENABLE(afterimage,
233 [ --enable-afterimage enable integration with libAfterImage for background images], 230 [ --enable-afterimage enable integration with libAfterImage for background images (deprecated)],
234 [if test x$enableval = xyes -o x$enableval = xno; then 231 [if test x$enableval = xyes -o x$enableval = xno; then
235 support_afterimage=$enableval 232 support_afterimage=$enableval
236 fi]) 233 fi])
237 234
238AC_ARG_WITH(afterimage_config, 235AC_ARG_WITH(afterimage_config,
… …
243 240
244AC_ARG_ENABLE(pixbuf, 241AC_ARG_ENABLE(pixbuf,
245 [ --enable-pixbuf enable integration with gdk-pixbuf for background images], 242 [ --enable-pixbuf enable integration with gdk-pixbuf for background images],
246 [if test x$enableval = xyes -o x$enableval = xno; then 243 [if test x$enableval = xyes -o x$enableval = xno; then
247 support_pixbuf=$enableval 244 support_pixbuf=$enableval
245 fi])
246
247AC_ARG_ENABLE(startup-notification,
248 [ --enable-startup-notification enable freedesktop startup notification support],
249 [if test x$enableval = xyes -o x$enableval = xno; then
250 support_startup_notification=$enableval
248 fi]) 251 fi])
249 252
250AC_ARG_ENABLE(transparency, 253AC_ARG_ENABLE(transparency,
251 [ --enable-transparency enable transparent backgrounds], 254 [ --enable-transparency enable transparent backgrounds],
252 [if test x$enableval = xyes -o x$enableval = xno; then 255 [if test x$enableval = xyes -o x$enableval = xno; then
… …
431 434
432AC_PATH_PROG(TIC, tic, :) 435AC_PATH_PROG(TIC, tic, :)
433 436
434AC_PATH_XTRA 437AC_PATH_XTRA
435 438
439image_lib=none
440
436PIXBUF_CFLAGS= 441PIXBUF_CFLAGS=
437PIXBUF_LIBS= 442PIXBUF_LIBS=
438 443
439if test x$support_pixbuf = xyes; then 444if test x$support_pixbuf = xyes; then
440 support_pixbuf=no 445 support_pixbuf=no
441 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 446 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
442 AC_MSG_CHECKING(for gdk-pixbuf) 447 AC_MSG_CHECKING(for gdk-pixbuf)
443 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-xlib-2.0; then 448 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then
444 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --cflags`" 449 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
445 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --libs`" 450 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
446 support_pixbuf=yes 451 support_pixbuf=yes
447 fi 452 fi
448 453
449 if test x$support_pixbuf = xyes; then 454 if test x$support_pixbuf = xyes; then
450 AC_MSG_RESULT(ok) 455 AC_MSG_RESULT(ok)
456 image_lib=gdk-pixbuf
451 support_afterimage=no 457 support_afterimage=no
452 AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing) 458 AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing)
453 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.) 459 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
454 else 460 else
455 AC_MSG_RESULT(no) 461 AC_MSG_RESULT(no)
… …
457fi 463fi
458 464
459AC_SUBST(PIXBUF_CFLAGS) 465AC_SUBST(PIXBUF_CFLAGS)
460AC_SUBST(PIXBUF_LIBS) 466AC_SUBST(PIXBUF_LIBS)
461 467
468STARTUP_NOTIFICATION_CFLAGS=
469STARTUP_NOTIFICATION_LIBS=
470
471if test x$support_startup_notification = xyes; then
472 support_startup_notification=no
473 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
474 AC_MSG_CHECKING(for libstartup-notification)
475 if test $PKG_CONFIG != no && $PKG_CONFIG --exists libstartup-notification-1.0; then
476 STARTUP_NOTIFICATION_CFLAGS="`$PKG_CONFIG libstartup-notification-1.0 --cflags`"
477 STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG libstartup-notification-1.0 --libs`"
478 support_startup_notification=yes
479 fi
480
481 if test x$support_startup_notification = xyes; then
482 AC_MSG_RESULT(ok)
483 AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, Define if freedesktop startup notifications should be supported)
484 else
485 AC_MSG_RESULT(no)
486 fi
487fi
488
489AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
490AC_SUBST(STARTUP_NOTIFICATION_LIBS)
491
462AFTERIMAGE_CFLAGS= 492AFTERIMAGE_CFLAGS=
463AFTERIMAGE_LIBS= 493AFTERIMAGE_LIBS=
464AFTERIMAGE_VERSION=
465 494
466if test x$support_afterimage = xyes; then 495if test x$support_afterimage = xyes; then
467 support_afterimage=no 496 support_afterimage=no
468 497
469 if test "x$afterimage_config" = "x" ; then 498 if test "x$afterimage_config" = "x" ; then
470 AC_PATH_PROG(afterimage_config, afterimage-config, no) 499 AC_PATH_PROG(afterimage_config, afterimage-config, no)
471 fi 500 fi
472 if test "x$afterimage_config" != "xno" ; then 501 if test "x$afterimage_config" != "xno" ; then
473 AC_MSG_CHECKING(for libAfterImage version >= 1.15) 502 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
474 xAFTERIMAGE_VERSION=`$afterimage_config --version` 503 AFTERIMAGE_VERSION=`$afterimage_config --version`
475 if test -n "$xAFTERIMAGE_VERSION" ; then 504 if test -n "$AFTERIMAGE_VERSION" ; then
476 xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 505 AFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
477 xAFTERIMAGE_LIBS=`$afterimage_config --libs` 506 AFTERIMAGE_LIBS=`$afterimage_config --libs`
478 if test "x$xAFTERIMAGE_LIBS" != "x"; then 507 if test "x$AFTERIMAGE_LIBS" != "x"; then
479 libai_ver_major=`echo $xAFTERIMAGE_VERSION | cut -f 1 -d .` 508 libai_ver_major=`echo $AFTERIMAGE_VERSION | cut -f 1 -d .`
480 libai_ver_minor=`echo $xAFTERIMAGE_VERSION | cut -f 2 -d .` 509 libai_ver_minor=`echo $AFTERIMAGE_VERSION | cut -f 2 -d .`
481 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then 510 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then
482 support_afterimage=yes 511 support_afterimage=yes
483 AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS"
484 AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS"
485 AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION"
486 fi 512 fi
487 fi 513 fi
488 fi 514 fi
489 if test "x$support_afterimage" = "xyes"; then 515 if test "x$support_afterimage" = "xyes"; then
490 AC_MSG_RESULT($AFTERIMAGE_LIBS) 516 AC_MSG_RESULT($AFTERIMAGE_LIBS)
517 image_lib=libafterimage
491 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing) 518 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
492 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.) 519 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
493 else 520 else
494 AC_MSG_RESULT(no) 521 AC_MSG_RESULT(no)
522 AFTERIMAGE_CFLAGS=
523 AFTERIMAGE_LIBS=
495 fi 524 fi
496 fi 525 fi
497fi 526fi
498 527
499AC_SUBST(AFTERIMAGE_CFLAGS) 528AC_SUBST(AFTERIMAGE_CFLAGS)
… …
509 sys/strredir.h \ 538 sys/strredir.h \
510 stdint.h \ 539 stdint.h \
511 wchar.h \ 540 wchar.h \
512 cwchar \ 541 cwchar \
513) 542)
514
515AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
516[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
517if test x$rxvt_cv_xpointer = xyes; then
518 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
519fi
520 543
521AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access, 544AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
522[AC_COMPILE_IFELSE( 545[AC_COMPILE_IFELSE(
523 [AC_LANG_PROGRAM([ 546 [AC_LANG_PROGRAM([
524#define XLIB_ILLEGAL_ACCESS 547#define XLIB_ILLEGAL_ACCESS
… …
562save_CFLAGS=$CFLAGS 585save_CFLAGS=$CFLAGS
563CFLAGS="$CFLAGS $X_CFLAGS" 586CFLAGS="$CFLAGS $X_CFLAGS"
564LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 587LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
565if test x$support_xim = xyes; then 588if test x$support_xim = xyes; then
566 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 589 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
567 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 590 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
591 #include <X11/Xlib.h>
568 #include <stdlib.h> 592 #include <stdlib.h>
569 main() { 593 int main() {
570 char *p; 594 char *p;
571 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 595 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
572 exit (XSupportsLocale() ? 0 : 1); 596 exit (XSupportsLocale() ? 0 : 1);
573 else 597 else
574 exit (1);}]])],[dnl 598 exit (1);
599 }
575 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 600 ]])],[rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[:])])
576 :])])
577 if test x$rxvt_cv_func_xlocale = xyes; then 601 if test x$rxvt_cv_func_xlocale = xyes; then
578 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input) 602 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
579 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb, 603 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
580 [AC_COMPILE_IFELSE([ 604 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
581 #include <X11/Xlib.h> 605 #include <X11/Xlib.h>
582 606
583 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); 607 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
584 608
585 void f() { 609 void f() {
586 XIMCallback cb; 610 XIMCallback cb;
587 cb.callback = im_destroy_cb; 611 cb.callback = im_destroy_cb;
588 } 612 }
589 ],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)]) 613 ]])],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
590 614
591 if test x$rxvt_cv_broken_ximcb = xyes; then 615 if test x$rxvt_cv_broken_ximcb = xyes; then
592 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.) 616 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
593 fi 617 fi
594 fi 618 fi
… …
622TTY_GROUP_CHECK 646TTY_GROUP_CHECK
623 647
624dnl# -------------------------------------------------------------------------- 648dnl# --------------------------------------------------------------------------
625dnl# now add and remove other stuff 649dnl# now add and remove other stuff
626dnl# -------------------------------------------------------------------------- 650dnl# --------------------------------------------------------------------------
627if test x$support_xft = xyes; then 651if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then
652 rxvt_have_xrender=no
653 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
654 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
655 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS"
656 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
657 rxvt_have_xrender=yes
658
659 save_LIBS="$LIBS"
660 LIBS="$LIBS $X_LIBS"
661 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no])
662 AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no])
663 LIBS="$save_LIBS"
664 fi
665fi
666
667if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then
628 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 668 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
629 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 669 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
630 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 670 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
631 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 671 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
632 else 672 else
… …
635 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 675 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
636 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 676 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
637 fi 677 fi
638 fi 678 fi
639 679
680 if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then
681 X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS"
682 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
683 fi
684
640 save_LIBS="$LIBS" 685 save_LIBS="$LIBS"
641 LIBS="$LIBS $X_LIBS" 686 LIBS="$LIBS $X_LIBS"
642 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 687 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
643 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no]) 688 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
689 AC_CHECK_HEADERS(fontconfig/fontconfig.h,,[support_xft=no])
690 AC_CHECK_LIB(fontconfig,FcPatternGet,:,[support_xft=no])
644 LIBS="$save_LIBS" 691 LIBS="$save_LIBS"
645 692
646 if test x$support_xft = xyes; then 693 if test x$support_xft = xyes; then
647 AC_DEFINE(XFT, 1, Define to enable xft support) 694 AC_DEFINE(XFT, 1, Define to enable xft support)
648 fi 695 fi
… …
658fi 705fi
659if test x$support_fading = xyes; then 706if test x$support_fading = xyes; then
660 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) 707 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
661fi 708fi
662if test x$support_inheritpixmap = xyes; then 709if test x$support_inheritpixmap = xyes; then
710 if test x$rxvt_have_xrender = xyes; then
711 LIBS="$LIBS -lm"
712 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
713 fi
663 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background) 714 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
664fi 715fi
665if test x$support_keepscrolling = xno; then 716if test x$support_keepscrolling = xno; then
666 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) 717 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
667fi 718fi
… …
791if test x$RESFALLBACK != x; then 842if test x$RESFALLBACK != x; then
792 echo " resource class fallback: $RESFALLBACK" 843 echo " resource class fallback: $RESFALLBACK"
793fi 844fi
794echo 845echo
795echo " embedded perl: $support_perl" 846echo " embedded perl: $support_perl"
796echo " libafterimage: $support_afterimage" 847echo " image library: $image_lib"
797echo 848echo
798if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then 849if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then
799 echo ".----------------------------------------------------------------." 850 echo ".----------------------------------------------------------------."
800 echo ". WARNING: --enable-xim was specified however the locale support ." 851 echo ". WARNING: --enable-xim was specified however the locale support ."
801 echo ". functions could not be found. ." 852 echo ". functions could not be found. ."

Diff Legend

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