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.131 by sf-exg, Tue Dec 13 19:13:27 2011 UTC vs.
Revision 1.154 by sf-exg, Tue Jun 16 12:00:07 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
… …
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_startup_notification=yes 92support_startup_notification=yes
100support_afterimage=yes
101support_xft=yes 93support_xft=yes
102support_unicode3=no 94support_unicode3=no
103support_combining=yes 95support_combining=yes
104support_8bitctrls=no 96support_8bitctrls=no
105support_iso14755=yes 97support_iso14755=yes
… …
132 support_utmp=no 124 support_utmp=no
133 support_wtmp=no 125 support_wtmp=no
134 support_xim=no 126 support_xim=no
135 support_pixbuf=no 127 support_pixbuf=no
136 support_startup_notification=no 128 support_startup_notification=no
137 support_afterimage=no
138 support_xft=no 129 support_xft=no
139 support_unicode3=no 130 support_unicode3=no
140 support_combining=no 131 support_combining=no
141 support_8bitctrls=no 132 support_8bitctrls=no
142 support_iso14755=no 133 support_iso14755=no
… …
161 support_utmp=yes 152 support_utmp=yes
162 support_wtmp=yes 153 support_wtmp=yes
163 support_xim=yes 154 support_xim=yes
164 support_pixbuf=yes 155 support_pixbuf=yes
165 support_startup_notification=yes 156 support_startup_notification=yes
166 support_afterimage=yes
167 support_xft=yes 157 support_xft=yes
168 support_unicode3=yes 158 support_unicode3=yes
169 support_combining=yes 159 support_combining=yes
170 #support_8bitctrls=yes 160 #support_8bitctrls=yes
171 support_iso14755=yes 161 support_iso14755=yes
… …
173 support_perl=yes 163 support_perl=yes
174 codesets=all 164 codesets=all
175 fi 165 fi
176 ]) 166 ])
177 167
178ASSERTIONS=no 168support_assertions=no
179AC_ARG_ENABLE(assert, 169AC_ARG_ENABLE(assert,
180 [ --enable-assert enable assertions], 170 [ --enable-assert enable assertions],
181 [if test x$enableval = xyes; then 171 [if test x$enableval = xyes; then
182 ASSERTIONS=yes 172 support_assertions=yes
183 fi]) 173 fi])
184if test x$ASSERTIONS = xno; then 174if test x$support_assertions = xno; then
185 AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging)) 175 AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging))
186fi 176fi
187 177
188WARNINGS=no 178support_warnings=no
189AC_ARG_ENABLE(warnings, 179AC_ARG_ENABLE(warnings,
190 [ --enable-warnings turn on g++ warnings], 180 [ --enable-warnings turn on g++ warnings],
191 [if test x$enableval = xyes; then 181 [if test x$enableval = xyes; then
192 WARNINGS=yes 182 support_warnings=yes
193 fi]) 183 fi])
194if test x$GXX = xyes; then 184if test x$GXX = xyes; then
195 if test $WARNINGS = yes; then 185 if test $support_warnings = yes; then
196 save_CXXFLAGS="$CXXFLAGS" 186 save_CXXFLAGS="$CXXFLAGS"
197 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor" 187 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-unused-value"
198 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"]) 188 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"])
199 else 189 else
200 CXXFLAGS="$CXXFLAGS -w" 190 CXXFLAGS="$CXXFLAGS -w"
201 fi 191 fi
202fi 192fi
… …
233 [ --enable-font-styles enable bold and italic support], 223 [ --enable-font-styles enable bold and italic support],
234 [if test x$enableval = xyes -o x$enableval = xno; then 224 [if test x$enableval = xyes -o x$enableval = xno; then
235 support_styles=$enableval 225 support_styles=$enableval
236 fi]) 226 fi])
237 227
238AC_ARG_ENABLE(afterimage,
239 [ --enable-afterimage enable integration with libAfterImage for background images],
240 [if test x$enableval = xyes -o x$enableval = xno; then
241 support_afterimage=$enableval
242 fi])
243
244AC_ARG_WITH(afterimage_config,
245 [ --with-afterimage-config=DIR use libAfterImage config script in DIR],
246 [if test "x$withval" != x; then
247 afterimage_config=$withval/afterimage-config
248 fi])
249
250AC_ARG_ENABLE(pixbuf, 228AC_ARG_ENABLE(pixbuf,
251 [ --enable-pixbuf enable integration with gdk-pixbuf for background images], 229 [ --enable-pixbuf enable integration with gdk-pixbuf for background images],
252 [if test x$enableval = xyes -o x$enableval = xno; then 230 [if test x$enableval = xyes -o x$enableval = xno; then
253 support_pixbuf=$enableval 231 support_pixbuf=$enableval
254 fi]) 232 fi])
… …
315 [ --disable-delete-key disable handling of the delete key], 293 [ --disable-delete-key disable handling of the delete key],
316 [if test x$enableval = xno; then 294 [if test x$enableval = xno; then
317 AC_DEFINE(NO_DELETE_KEY, 1, Define if you don't want support for the (non-keypad) delete key) 295 AC_DEFINE(NO_DELETE_KEY, 1, Define if you don't want support for the (non-keypad) delete key)
318 fi]) 296 fi])
319 297
298support_resources=yes
320AC_ARG_ENABLE(resources, 299AC_ARG_ENABLE(resources,
321 [ --disable-resources disable all resource checking], 300 [ --disable-resources disable all resource checking],
322 [if test x$enableval = xno; then 301 [if test x$enableval = xno; then
323 AC_DEFINE(NO_RESOURCES, 1, Define if you don't want any resources read) 302 support_resources=no
324 fi]) 303 fi])
325 304
326AC_ARG_ENABLE(8bitctrls, 305AC_ARG_ENABLE(8bitctrls,
327 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)], 306 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)],
328 [if test x$enableval = xyes -o x$enableval = xno; then 307 [if test x$enableval = xyes -o x$enableval = xno; then
… …
432 [ --with-terminfo=PATH set the path to the terminfo tree to PATH], 411 [ --with-terminfo=PATH set the path to the terminfo tree to PATH],
433 [if test x$withval != x; then 412 [if test x$withval != x; then
434 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" 413 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
435 fi]) 414 fi])
436 415
416if test x$support_resources = xno; then
417 if test x$support_frills = xyes || test x$support_perl = xyes; then
418 AC_MSG_ERROR([--disable-resources requires --disable-frills --disable-perl])
419 fi
420
421 AC_DEFINE(NO_RESOURCES, 1, Define if you don't want any resources read)
422fi
423
437dnl# -------------------------------------------------------------------------- 424dnl# --------------------------------------------------------------------------
438 425
439LIBEV_M4_AVOID_LIBRT=1 426LIBEV_M4_AVOID_LIBRT=1
440m4_include([libev/libev.m4]) 427m4_include([libev/libev.m4])
441 428
… …
443 430
444AC_PATH_PROG(TIC, tic, :) 431AC_PATH_PROG(TIC, tic, :)
445 432
446AC_PATH_XTRA 433AC_PATH_XTRA
447 434
435AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
436
448image_lib=none 437image_lib=none
449 438
450PIXBUF_CFLAGS= 439PIXBUF_CFLAGS=
451PIXBUF_LIBS= 440PIXBUF_LIBS=
452 441
453if test x$support_pixbuf = xyes; then 442if test x$support_pixbuf = xyes; then
454 support_pixbuf=no 443 RXVT_CHECK_MODULES([PIXBUF], [gdk-pixbuf-2.0], [
455 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
456 AC_MSG_CHECKING(for gdk-pixbuf)
457 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then
458 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
459 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
460 support_pixbuf=yes
461 fi
462
463 if test x$support_pixbuf = xyes; then
464 AC_MSG_RESULT(ok)
465 image_lib=gdk-pixbuf 444 image_lib=gdk-pixbuf
466 support_afterimage=no
467 AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing) 445 AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing)
468 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.) 446 ], [:])
469 else
470 AC_MSG_RESULT(no)
471 fi
472fi 447fi
473 448
474AC_SUBST(PIXBUF_CFLAGS) 449AC_SUBST(PIXBUF_CFLAGS)
475AC_SUBST(PIXBUF_LIBS) 450AC_SUBST(PIXBUF_LIBS)
476 451
477STARTUP_NOTIFICATION_CFLAGS= 452STARTUP_NOTIFICATION_CFLAGS=
478STARTUP_NOTIFICATION_LIBS= 453STARTUP_NOTIFICATION_LIBS=
479 454
480if test x$support_startup_notification = xyes; then 455if test x$support_startup_notification = xyes; then
481 support_startup_notification=no 456 RXVT_CHECK_MODULES([STARTUP_NOTIFICATION], [libstartup-notification-1.0], [
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) 457 AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, Define if freedesktop startup notifications should be supported)
493 else 458 ], [:])
494 AC_MSG_RESULT(no)
495 fi
496fi 459fi
497 460
498AC_SUBST(STARTUP_NOTIFICATION_CFLAGS) 461AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
499AC_SUBST(STARTUP_NOTIFICATION_LIBS) 462AC_SUBST(STARTUP_NOTIFICATION_LIBS)
500 463
501AFTERIMAGE_CFLAGS=
502AFTERIMAGE_LIBS=
503
504if test x$support_afterimage = xyes; then 464if test x$support_frills = xyes; then
505 support_afterimage=no 465 RXVT_CHECK_MODULES([XMU], [xmu], [
506 466 X_LIBS="$XMU_LIBS $X_LIBS"
507 if test "x$afterimage_config" = "x" ; then 467 CPPFLAGS="$CPPFLAGS $XMU_CFLAGS"
508 AC_PATH_PROG(afterimage_config, afterimage-config, no) 468 AC_DEFINE(HAVE_XMU, 1, Define to enable Xmu support)
509 fi 469 ], [:])
510 if test "x$afterimage_config" != "xno" ; then
511 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
512 AFTERIMAGE_VERSION=`$afterimage_config --version`
513 if test -n "$AFTERIMAGE_VERSION" ; then
514 AFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
515 AFTERIMAGE_LIBS=`$afterimage_config --libs`
516 if test "x$AFTERIMAGE_LIBS" != "x"; then
517 libai_ver_major=`echo $AFTERIMAGE_VERSION | cut -f 1 -d .`
518 libai_ver_minor=`echo $AFTERIMAGE_VERSION | cut -f 2 -d .`
519 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then
520 support_afterimage=yes
521 fi
522 fi
523 fi
524 if test "x$support_afterimage" = "xyes"; then
525 AC_MSG_RESULT($AFTERIMAGE_LIBS)
526 image_lib=libafterimage
527 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
528 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
529 else
530 AC_MSG_RESULT(no)
531 AFTERIMAGE_CFLAGS=
532 AFTERIMAGE_LIBS=
533 fi
534 fi
535fi 470fi
536
537AC_SUBST(AFTERIMAGE_CFLAGS)
538AC_SUBST(AFTERIMAGE_LIBS)
539 471
540dnl# -------------------------------------------------------------------------- 472dnl# --------------------------------------------------------------------------
541dnl# CHECKING FOR HEADER FILES 473dnl# CHECKING FOR HEADER FILES
542dnl# -------------------------------------------------------------------------- 474dnl# --------------------------------------------------------------------------
543AC_CHECK_HEADERS( \ 475AC_CHECK_HEADERS( \
… …
545 sys/ioctl.h \ 477 sys/ioctl.h \
546 sys/sockio.h \ 478 sys/sockio.h \
547 sys/strredir.h \ 479 sys/strredir.h \
548 stdint.h \ 480 stdint.h \
549 wchar.h \ 481 wchar.h \
550 cwchar \
551) 482)
552 483
553AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access, 484AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
554[AC_COMPILE_IFELSE( 485[AC_COMPILE_IFELSE(
555 [AC_LANG_PROGRAM([ 486 [AC_LANG_PROGRAM([
… …
589dnl# -------------------------------------------------------------------------- 520dnl# --------------------------------------------------------------------------
590dnl# -------------------------------------------------------------------------- 521dnl# --------------------------------------------------------------------------
591 522
592dnl# this is a really hack test for some basic Xlocale stuff 523dnl# this is a really hack test for some basic Xlocale stuff
593save_LIBS=$LIBS 524save_LIBS=$LIBS
594save_CFLAGS=$CFLAGS 525save_CXXFLAGS=$CXXFLAGS
595CFLAGS="$CFLAGS $X_CFLAGS" 526CXXFLAGS="$CXXFLAGS $X_CFLAGS"
596LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 527LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
597if test x$support_xim = xyes; then 528if test x$support_xim = xyes; then
598 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 529 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
599 [AC_RUN_IFELSE([AC_LANG_SOURCE([[ 530 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
600 #include <X11/Xlib.h> 531 #include <X11/Xlib.h>
… …
632#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) 563#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
633if test x$rxvt_cv_func_xsetlocale = xyes; then 564if test x$rxvt_cv_func_xsetlocale = xyes; then
634 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 565 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
635fi 566fi
636LIBS=$save_LIBS 567LIBS=$save_LIBS
637CFLAGS=$save_CFLAGS 568CXXFLAGS=$save_CXXFLAGS
638
639AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
640[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])
641if test x$rxvt_cv_func_setlocale = xyes; then
642 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
643fi
644 569
645AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo, 570AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,
646[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])]) 571[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])])
647if test x$rxvt_cv_func_nl_langinfo = xyes; then 572if test x$rxvt_cv_func_nl_langinfo = xyes; then
648 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) 573 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
… …
655TTY_GROUP_CHECK 580TTY_GROUP_CHECK
656 581
657dnl# -------------------------------------------------------------------------- 582dnl# --------------------------------------------------------------------------
658dnl# now add and remove other stuff 583dnl# now add and remove other stuff
659dnl# -------------------------------------------------------------------------- 584dnl# --------------------------------------------------------------------------
585support_image=no
586if test x$support_inheritpixmap = xyes || test x$support_pixbuf = xyes; then
587 support_image=yes
588fi
660if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then 589if test x$support_xft = xyes || test x$support_image = xyes; then
661 rxvt_have_xrender=no 590 rxvt_have_xrender=no
662 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 591 RXVT_CHECK_MODULES([XRENDER], [xrender], [
663 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then 592 X_LIBS="$XRENDER_LIBS $X_LIBS"
664 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS" 593 CPPFLAGS="$CPPFLAGS $XRENDER_CFLAGS"
665 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
666 rxvt_have_xrender=yes 594 rxvt_have_xrender=yes
667 595
668 save_LIBS="$LIBS" 596 save_LIBS="$LIBS"
669 LIBS="$LIBS $X_LIBS" 597 LIBS="$LIBS $X_LIBS"
670 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no]) 598 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no])
671 AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no]) 599 AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no])
672 LIBS="$save_LIBS" 600 LIBS="$save_LIBS"
673 fi 601 ], [:])
674fi 602fi
675 603
676if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then 604if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then
677 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 605 RXVT_CHECK_MODULES([XFT], [fontconfig xft], [
678 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 606 X_LIBS="$XFT_LIBS $X_LIBS"
679 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 607 CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
680 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 608 ], [
681 else
682 AC_PATH_PROG(XFT_CONFIG, xft-config, no) 609 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
683 if test $XFT_CONFIG != no; then 610 if test $XFT_CONFIG != no; then
684 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 611 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
685 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 612 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
686 fi 613 fi
687 fi 614 ])
688
689 if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then
690 X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS"
691 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
692 fi
693 615
694 save_LIBS="$LIBS" 616 save_LIBS="$LIBS"
695 LIBS="$LIBS $X_LIBS" 617 LIBS="$LIBS $X_LIBS"
696 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
697 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
698 AC_CHECK_HEADERS(fontconfig/fontconfig.h,,[support_xft=no]) 618 AC_CHECK_HEADERS(X11/Xft/Xft.h fontconfig/fontconfig.h,,[support_xft=no])
699 AC_CHECK_LIB(fontconfig,FcPatternGet,:,[support_xft=no]) 619 AC_CHECK_FUNCS(XftDrawString32 FcPatternGet,,[support_xft=no])
700 LIBS="$save_LIBS" 620 LIBS="$save_LIBS"
701 621
702 if test x$support_xft = xyes; then 622 if test x$support_xft = xyes; then
703 AC_DEFINE(XFT, 1, Define to enable xft support) 623 AC_DEFINE(XFT, 1, Define to enable xft support)
704 fi 624 fi
705fi 625fi
626
627if test x$support_image = xyes && test x$rxvt_have_xrender = xyes; then
628 AC_MSG_CHECKING(for Render >= 0.11)
629 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
630#include <X11/extensions/Xrender.h>
631#if RENDER_MAJOR == 0 && RENDER_MINOR <= 10
632error
633#endif
634]])],[],[support_image=no])
635 if test x$support_image = xyes; then
636 AC_MSG_RESULT(ok)
637 LIBS="$LIBS -lm"
638 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
639
640 if test x$support_inheritpixmap = xyes; then
641 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
642 fi
643 else
644 AC_MSG_RESULT(no)
645 fi
646fi
647
706if test x$support_styles = xyes; then 648if test x$support_styles = xyes; then
707 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support) 649 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
708fi 650fi
709if test x$support_iso14755 = xyes; then 651if test x$support_iso14755 = xyes; then
710 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support) 652 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
… …
712if test x$support_8bitctrls = xyes; then 654if test x$support_8bitctrls = xyes; then
713 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences) 655 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
714fi 656fi
715if test x$support_fading = xyes; then 657if test x$support_fading = xyes; then
716 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) 658 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
717fi
718if test x$support_inheritpixmap = xyes; then
719 if test x$rxvt_have_xrender = xyes; then
720 LIBS="$LIBS -lm"
721 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
722 fi
723 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
724fi 659fi
725if test x$support_keepscrolling = xno; then 660if test x$support_keepscrolling = xno; then
726 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) 661 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
727fi 662fi
728if test x$support_selectionscrolling = xyes; then 663if test x$support_selectionscrolling = xyes; then
… …
780 esac 715 esac
781done 716done
782 717
783IF_PERL=\# 718IF_PERL=\#
784if test x$support_perl = xyes; then 719if test x$support_perl = xyes; then
785 AC_PATH_PROG(PERL, perl5) 720 AC_PATH_PROG(PERL, perl5, perl)
786 AC_PATH_PROG(PERL, perl)
787 721
788 AC_MSG_CHECKING(for $PERL suitability) 722 AC_MSG_CHECKING(for $PERL suitability)
789 if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then 723 if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then
790 724
791 save_CXXFLAGS="$CXXFLAGS" 725 save_CXXFLAGS="$CXXFLAGS"

Diff Legend

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