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.152 by sf-exg, Tue Jun 16 11:56:37 2015 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 ""
… …
24orig_CXXFLAGS="$CXXFLAGS" 24orig_CXXFLAGS="$CXXFLAGS"
25 25
26dnl# Checks for programs. 26dnl# Checks for programs.
27AC_PROG_CC 27AC_PROG_CC
28AC_PROG_CXX 28AC_PROG_CXX
29AC_PROG_CPP
30AC_PROG_INSTALL 29AC_PROG_INSTALL
31 30
32AC_AIX 31AC_AIX
33AC_GNU_SOURCE 32AC_GNU_SOURCE
34AC_ISC_POSIX 33AC_ISC_POSIX
35AC_LANG(C++) 34AC_LANG(C++)
36 35
36LINKER="$CXX"
37dnl check whether we can link with gcc -lsupc++ 37dnl check whether we can link with gcc -lsupc++
38if test x$GCC = xyes && test x$GXX = xyes; then 38if test x$GCC = xyes && test x$GXX = xyes; then
39 dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it 39 dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it
40 AC_MSG_CHECKING([for working libsupc++]) 40 AC_MSG_CHECKING([for working libsupc++])
41 save_CXX="$CXX" 41 save_CXX="$CXX"
42 save_LIBS="$LIBS" 42 save_LIBS="$LIBS"
43 CXX="$CC" 43 CXX="$CC"
44 LIBS="$LIBS -lsupc++" 44 LIBS="$LIBS -lsupc++"
45 LINKER="$CC"
46 AC_LINK_IFELSE( 45 AC_LINK_IFELSE(
47 [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])], 46 [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])],
48 [AC_MSG_RESULT(ok)], 47 [AC_MSG_RESULT(ok)
48 LINKER="$CC"],
49 [ 49 [
50 AC_MSG_RESULT([no, making everything bigger and slower]) 50 AC_MSG_RESULT([no, making everything bigger and slower])
51 LIBS="$save_LIBS" 51 LIBS="$save_LIBS"
52 LINKER="$save_CXX"
53 ] 52 ]
54 ) 53 )
55 CXX="$save_CXX" 54 CXX="$save_CXX"
56fi 55fi
57AC_SUBST(LINKER,[$LINKER]) 56AC_SUBST(LINKER,[$LINKER])
… …
66 else 65 else
67 CXXFLAGS="-O" 66 CXXFLAGS="-O"
68 fi 67 fi
69 CFLAGS="$CXXFLAGS" 68 CFLAGS="$CXXFLAGS"
70fi 69fi
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 70
78dnl# FreeBSD needs to link libxpg4 71dnl# FreeBSD needs to link libxpg4
79AC_SEARCH_LIBS(setlocale, xpg4) 72AC_SEARCH_LIBS(setlocale, xpg4)
80 73
81dnl# solaris needs to link libnsl and socket 74dnl# solaris needs to link libnsl and socket
… …
94support_scroll_rxvt=yes 87support_scroll_rxvt=yes
95support_scroll_next=yes 88support_scroll_next=yes
96support_scroll_xterm=yes 89support_scroll_xterm=yes
97support_xim=yes 90support_xim=yes
98support_pixbuf=yes 91support_pixbuf=yes
99support_afterimage=yes 92support_startup_notification=yes
100support_xft=yes 93support_xft=yes
101support_unicode3=no 94support_unicode3=no
102support_combining=yes 95support_combining=yes
103support_8bitctrls=no 96support_8bitctrls=no
104support_iso14755=yes 97support_iso14755=yes
… …
130 support_scroll_xterm=no 123 support_scroll_xterm=no
131 support_utmp=no 124 support_utmp=no
132 support_wtmp=no 125 support_wtmp=no
133 support_xim=no 126 support_xim=no
134 support_pixbuf=no 127 support_pixbuf=no
135 support_afterimage=no 128 support_startup_notification=no
136 support_xft=no 129 support_xft=no
137 support_unicode3=no 130 support_unicode3=no
138 support_combining=no 131 support_combining=no
139 support_8bitctrls=no 132 support_8bitctrls=no
140 support_iso14755=no 133 support_iso14755=no
… …
158 support_scroll_xterm=yes 151 support_scroll_xterm=yes
159 support_utmp=yes 152 support_utmp=yes
160 support_wtmp=yes 153 support_wtmp=yes
161 support_xim=yes 154 support_xim=yes
162 support_pixbuf=yes 155 support_pixbuf=yes
163 support_afterimage=yes 156 support_startup_notification=yes
164 support_xft=yes 157 support_xft=yes
165 support_unicode3=yes 158 support_unicode3=yes
166 support_combining=yes 159 support_combining=yes
167 #support_8bitctrls=yes 160 #support_8bitctrls=yes
168 support_iso14755=yes 161 support_iso14755=yes
… …
170 support_perl=yes 163 support_perl=yes
171 codesets=all 164 codesets=all
172 fi 165 fi
173 ]) 166 ])
174 167
175ASSERTIONS=no 168support_assertions=no
176AC_ARG_ENABLE(assert, 169AC_ARG_ENABLE(assert,
177 [ --enable-assert enable assertions], 170 [ --enable-assert enable assertions],
178 [if test x$enableval = xyes; then 171 [if test x$enableval = xyes; then
179 ASSERTIONS=yes 172 support_assertions=yes
180 fi]) 173 fi])
181if test x$ASSERTIONS = xno; then 174if test x$support_assertions = xno; then
182 AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging)) 175 AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging))
183fi 176fi
184 177
185WARNINGS=no 178support_warnings=no
186AC_ARG_ENABLE(warnings, 179AC_ARG_ENABLE(warnings,
187 [ --enable-warnings turn on g++ warnings], 180 [ --enable-warnings turn on g++ warnings],
188 [if test x$enableval = xyes; then 181 [if test x$enableval = xyes; then
189 WARNINGS=yes 182 support_warnings=yes
190 fi]) 183 fi])
191if test x$GXX = xyes; then 184if test x$GXX = xyes; then
192 if test $WARNINGS = yes; then 185 if test $support_warnings = yes; then
193 save_CXXFLAGS="$CXXFLAGS" 186 save_CXXFLAGS="$CXXFLAGS"
194 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor" 187 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-unused-value"
195 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"]) 188 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"])
196 else 189 else
197 CXXFLAGS="$CXXFLAGS -w" 190 CXXFLAGS="$CXXFLAGS -w"
198 fi 191 fi
199fi 192fi
… …
230 [ --enable-font-styles enable bold and italic support], 223 [ --enable-font-styles enable bold and italic support],
231 [if test x$enableval = xyes -o x$enableval = xno; then 224 [if test x$enableval = xyes -o x$enableval = xno; then
232 support_styles=$enableval 225 support_styles=$enableval
233 fi]) 226 fi])
234 227
235AC_ARG_ENABLE(afterimage,
236 [ --enable-afterimage enable integration with libAfterImage for background images],
237 [if test x$enableval = xyes -o x$enableval = xno; then
238 support_afterimage=$enableval
239 fi])
240
241AC_ARG_WITH(afterimage_config,
242 [ --with-afterimage-config=DIR use libAfterImage config script in DIR],
243 [if test "x$withval" != x; then
244 afterimage_config=$withval/afterimage-config
245 fi])
246
247AC_ARG_ENABLE(pixbuf, 228AC_ARG_ENABLE(pixbuf,
248 [ --enable-pixbuf enable integration with gdk-pixbuf for background images], 229 [ --enable-pixbuf enable integration with gdk-pixbuf for background images],
249 [if test x$enableval = xyes -o x$enableval = xno; then 230 [if test x$enableval = xyes -o x$enableval = xno; then
250 support_pixbuf=$enableval 231 support_pixbuf=$enableval
232 fi])
233
234AC_ARG_ENABLE(startup-notification,
235 [ --enable-startup-notification enable freedesktop startup notification support],
236 [if test x$enableval = xyes -o x$enableval = xno; then
237 support_startup_notification=$enableval
251 fi]) 238 fi])
252 239
253AC_ARG_ENABLE(transparency, 240AC_ARG_ENABLE(transparency,
254 [ --enable-transparency enable transparent backgrounds], 241 [ --enable-transparency enable transparent backgrounds],
255 [if test x$enableval = xyes -o x$enableval = xno; then 242 [if test x$enableval = xyes -o x$enableval = xno; then
… …
434 421
435AC_PATH_PROG(TIC, tic, :) 422AC_PATH_PROG(TIC, tic, :)
436 423
437AC_PATH_XTRA 424AC_PATH_XTRA
438 425
426AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
427
439image_lib=none 428image_lib=none
440 429
441PIXBUF_CFLAGS= 430PIXBUF_CFLAGS=
442PIXBUF_LIBS= 431PIXBUF_LIBS=
443 432
444if test x$support_pixbuf = xyes; then 433if test x$support_pixbuf = xyes; then
445 support_pixbuf=no 434 RXVT_CHECK_MODULES([PIXBUF], [gdk-pixbuf-2.0], [
446 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
447 AC_MSG_CHECKING(for gdk-pixbuf)
448 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then
449 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
450 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
451 support_pixbuf=yes
452 fi
453
454 if test x$support_pixbuf = xyes; then
455 AC_MSG_RESULT(ok)
456 image_lib=gdk-pixbuf 435 image_lib=gdk-pixbuf
457 support_afterimage=no
458 AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing) 436 AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing)
459 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.) 437 ], [:])
460 else
461 AC_MSG_RESULT(no)
462 fi
463fi 438fi
464 439
465AC_SUBST(PIXBUF_CFLAGS) 440AC_SUBST(PIXBUF_CFLAGS)
466AC_SUBST(PIXBUF_LIBS) 441AC_SUBST(PIXBUF_LIBS)
467 442
468AFTERIMAGE_CFLAGS= 443STARTUP_NOTIFICATION_CFLAGS=
469AFTERIMAGE_LIBS= 444STARTUP_NOTIFICATION_LIBS=
470AFTERIMAGE_VERSION=
471 445
472if test x$support_afterimage = xyes; then 446if test x$support_startup_notification = xyes; then
473 support_afterimage=no 447 RXVT_CHECK_MODULES([STARTUP_NOTIFICATION], [libstartup-notification-1.0], [
474 448 AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, Define if freedesktop startup notifications should be supported)
475 if test "x$afterimage_config" = "x" ; then 449 ], [:])
476 AC_PATH_PROG(afterimage_config, afterimage-config, no)
477 fi
478 if test "x$afterimage_config" != "xno" ; then
479 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
480 xAFTERIMAGE_VERSION=`$afterimage_config --version`
481 if test -n "$xAFTERIMAGE_VERSION" ; then
482 xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
483 xAFTERIMAGE_LIBS=`$afterimage_config --libs`
484 if test "x$xAFTERIMAGE_LIBS" != "x"; then
485 libai_ver_major=`echo $xAFTERIMAGE_VERSION | cut -f 1 -d .`
486 libai_ver_minor=`echo $xAFTERIMAGE_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
488 support_afterimage=yes
489 AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS"
490 AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS"
491 AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION"
492 fi
493 fi
494 fi
495 if test "x$support_afterimage" = "xyes"; then
496 AC_MSG_RESULT($AFTERIMAGE_LIBS)
497 image_lib=libafterimage
498 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.)
500 else
501 AC_MSG_RESULT(no)
502 fi
503 fi
504fi 450fi
505 451
506AC_SUBST(AFTERIMAGE_CFLAGS) 452AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
507AC_SUBST(AFTERIMAGE_LIBS) 453AC_SUBST(STARTUP_NOTIFICATION_LIBS)
508 454
509dnl# -------------------------------------------------------------------------- 455dnl# --------------------------------------------------------------------------
510dnl# CHECKING FOR HEADER FILES 456dnl# CHECKING FOR HEADER FILES
511dnl# -------------------------------------------------------------------------- 457dnl# --------------------------------------------------------------------------
512AC_CHECK_HEADERS( \ 458AC_CHECK_HEADERS( \
… …
514 sys/ioctl.h \ 460 sys/ioctl.h \
515 sys/sockio.h \ 461 sys/sockio.h \
516 sys/strredir.h \ 462 sys/strredir.h \
517 stdint.h \ 463 stdint.h \
518 wchar.h \ 464 wchar.h \
519 cwchar \
520) 465)
521 466
522AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access, 467AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
523[AC_COMPILE_IFELSE( 468[AC_COMPILE_IFELSE(
524 [AC_LANG_PROGRAM([ 469 [AC_LANG_PROGRAM([
… …
558dnl# -------------------------------------------------------------------------- 503dnl# --------------------------------------------------------------------------
559dnl# -------------------------------------------------------------------------- 504dnl# --------------------------------------------------------------------------
560 505
561dnl# this is a really hack test for some basic Xlocale stuff 506dnl# this is a really hack test for some basic Xlocale stuff
562save_LIBS=$LIBS 507save_LIBS=$LIBS
563save_CFLAGS=$CFLAGS 508save_CXXFLAGS=$CXXFLAGS
564CFLAGS="$CFLAGS $X_CFLAGS" 509CXXFLAGS="$CXXFLAGS $X_CFLAGS"
565LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 510LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
566if test x$support_xim = xyes; then 511if test x$support_xim = xyes; then
567 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 512 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
568 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 513 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
514 #include <X11/Xlib.h>
569 #include <stdlib.h> 515 #include <stdlib.h>
570 int main() { 516 int main() {
571 char *p; 517 char *p;
572 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 518 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
573 exit (XSupportsLocale() ? 0 : 1); 519 exit (XSupportsLocale() ? 0 : 1);
574 else 520 else
575 exit (1);}]])],[dnl 521 exit (1);
522 }
576 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 523 ]])],[rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[:])])
577 :])])
578 if test x$rxvt_cv_func_xlocale = xyes; then 524 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) 525 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, 526 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
581 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ 527 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
582 #include <X11/Xlib.h> 528 #include <X11/Xlib.h>
… …
600#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) 546#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
601if test x$rxvt_cv_func_xsetlocale = xyes; then 547if test x$rxvt_cv_func_xsetlocale = xyes; then
602 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 548 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
603fi 549fi
604LIBS=$save_LIBS 550LIBS=$save_LIBS
605CFLAGS=$save_CFLAGS 551CXXFLAGS=$save_CXXFLAGS
606
607AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
608[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])
609if test x$rxvt_cv_func_setlocale = xyes; then
610 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
611fi
612 552
613AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo, 553AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,
614[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])]) 554[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])])
615if test x$rxvt_cv_func_nl_langinfo = xyes; then 555if test x$rxvt_cv_func_nl_langinfo = xyes; then
616 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) 556 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
… …
623TTY_GROUP_CHECK 563TTY_GROUP_CHECK
624 564
625dnl# -------------------------------------------------------------------------- 565dnl# --------------------------------------------------------------------------
626dnl# now add and remove other stuff 566dnl# now add and remove other stuff
627dnl# -------------------------------------------------------------------------- 567dnl# --------------------------------------------------------------------------
568support_image=no
569if test x$support_inheritpixmap = xyes || test x$support_pixbuf = xyes; then
570 support_image=yes
571fi
628if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then 572if test x$support_xft = xyes || test x$support_image = xyes; then
629 rxvt_have_xrender=no 573 rxvt_have_xrender=no
630 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 574 RXVT_CHECK_MODULES([XRENDER], [xrender], [
631 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then 575 X_LIBS="$XRENDER_LIBS $X_LIBS"
632 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS" 576 CPPFLAGS="$CPPFLAGS $XRENDER_CFLAGS"
633 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
634 rxvt_have_xrender=yes 577 rxvt_have_xrender=yes
635 578
636 save_LIBS="$LIBS" 579 save_LIBS="$LIBS"
637 LIBS="$LIBS $X_LIBS" 580 LIBS="$LIBS $X_LIBS"
638 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no]) 581 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no])
639 AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no]) 582 AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no])
640 LIBS="$save_LIBS" 583 LIBS="$save_LIBS"
641 fi 584 ], [:])
642fi 585fi
643 586
644if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then 587if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then
645 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 588 RXVT_CHECK_MODULES([XFT], [fontconfig xft], [
646 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 589 X_LIBS="$XFT_LIBS $X_LIBS"
647 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 590 CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
648 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 591 ], [
649 else
650 AC_PATH_PROG(XFT_CONFIG, xft-config, no) 592 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
651 if test $XFT_CONFIG != no; then 593 if test $XFT_CONFIG != no; then
652 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 594 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
653 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 595 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
654 fi 596 fi
655 fi 597 ])
656
657 if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then
658 X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS"
659 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
660 fi
661 598
662 save_LIBS="$LIBS" 599 save_LIBS="$LIBS"
663 LIBS="$LIBS $X_LIBS" 600 LIBS="$LIBS $X_LIBS"
664 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
665 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
666 AC_CHECK_HEADERS(fontconfig/fontconfig.h,,[support_xft=no]) 601 AC_CHECK_HEADERS(X11/Xft/Xft.h fontconfig/fontconfig.h,,[support_xft=no])
667 AC_CHECK_LIB(fontconfig,FcPatternGet,:,[support_xft=no]) 602 AC_CHECK_FUNCS(XftDrawString32 FcPatternGet,,[support_xft=no])
668 LIBS="$save_LIBS" 603 LIBS="$save_LIBS"
669 604
670 if test x$support_xft = xyes; then 605 if test x$support_xft = xyes; then
671 AC_DEFINE(XFT, 1, Define to enable xft support) 606 AC_DEFINE(XFT, 1, Define to enable xft support)
672 fi 607 fi
673fi 608fi
609
610if test x$support_image = xyes && test x$rxvt_have_xrender = xyes; then
611 AC_MSG_CHECKING(for Render >= 0.11)
612 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
613#include <X11/extensions/Xrender.h>
614#if RENDER_MAJOR == 0 && RENDER_MINOR <= 10
615error
616#endif
617]])],[],[support_image=no])
618 if test x$support_image = xyes; then
619 AC_MSG_RESULT(ok)
620 LIBS="$LIBS -lm"
621 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
622
623 if test x$support_inheritpixmap = xyes; then
624 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
625 fi
626 else
627 AC_MSG_RESULT(no)
628 fi
629fi
630
674if test x$support_styles = xyes; then 631if test x$support_styles = xyes; then
675 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support) 632 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
676fi 633fi
677if test x$support_iso14755 = xyes; then 634if test x$support_iso14755 = xyes; then
678 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support) 635 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
… …
680if test x$support_8bitctrls = xyes; then 637if test x$support_8bitctrls = xyes; then
681 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences) 638 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
682fi 639fi
683if test x$support_fading = xyes; then 640if test x$support_fading = xyes; then
684 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) 641 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
685fi
686if test x$support_inheritpixmap = xyes; then
687 if test x$rxvt_have_xrender = xyes; then
688 LIBS="$LIBS -lm"
689 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
690 fi
691 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
692fi 642fi
693if test x$support_keepscrolling = xno; then 643if test x$support_keepscrolling = xno; then
694 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) 644 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
695fi 645fi
696if test x$support_selectionscrolling = xyes; then 646if test x$support_selectionscrolling = xyes; then
… …
748 esac 698 esac
749done 699done
750 700
751IF_PERL=\# 701IF_PERL=\#
752if test x$support_perl = xyes; then 702if test x$support_perl = xyes; then
753 AC_PATH_PROG(PERL, perl5) 703 AC_PATH_PROG(PERL, perl5, perl)
754 AC_PATH_PROG(PERL, perl)
755 704
756 AC_MSG_CHECKING(for $PERL suitability) 705 AC_MSG_CHECKING(for $PERL suitability)
757 if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then 706 if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then
758 707
759 save_CXXFLAGS="$CXXFLAGS" 708 save_CXXFLAGS="$CXXFLAGS"

Diff Legend

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