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.130 by mikachu, Sun Nov 13 16:03:31 2011 UTC vs.
Revision 1.157 by sf-exg, Fri Jul 23 19:18:52 2021 UTC

1dnl# 1dnl#
2dnl# Process this file with autoconf to produce a configure script. 2dnl# Process this file with autoconf to produce a configure script.
3dnl# 3dnl#
4 4
5AC_INIT 5AC_INIT
6AC_PREREQ(2.50) 6AC_PREREQ(2.71)
7AC_CONFIG_SRCDIR([src/feature.h]) 7AC_CONFIG_SRCDIR([src/feature.h])
8AC_CONFIG_HEADER(config.h:config.h.in) 8AC_CONFIG_HEADERS(config.h:config.h.in)
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_USE_SYSTEM_EXTENSIONS
33AC_GNU_SOURCE
34AC_ISC_POSIX
35AC_LANG(C++) 32AC_LANG(C++)
36 33
34if test "$ac_prog_cxx_stdcxx" != cxx11; then
35 AC_MSG_ERROR([the compiler does not support C++11])
36fi
37
38LINKER="$CXX"
37dnl check whether we can link with gcc -lsupc++ 39dnl check whether we can link with gcc -lsupc++
38if test x$GCC = xyes && test x$GXX = xyes; then 40if test x$GCC = xyes && test x$GXX = xyes; then
39 dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it 41 dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it
40 AC_MSG_CHECKING([for working libsupc++]) 42 AC_MSG_CHECKING([for working libsupc++])
41 save_CXX="$CXX" 43 save_CXX="$CXX"
42 save_LIBS="$LIBS" 44 save_LIBS="$LIBS"
43 CXX="$CC" 45 CXX="$CC"
44 LIBS="$LIBS -lsupc++" 46 LIBS="$LIBS -lsupc++"
45 LINKER="$CC"
46 AC_LINK_IFELSE( 47 AC_LINK_IFELSE(
47 [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])], 48 [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])],
48 [AC_MSG_RESULT(ok)], 49 [AC_MSG_RESULT(ok)
50 LINKER="$CC"],
49 [ 51 [
50 AC_MSG_RESULT([no, making everything bigger and slower]) 52 AC_MSG_RESULT([no, making everything bigger and slower])
51 LIBS="$save_LIBS" 53 LIBS="$save_LIBS"
52 LINKER="$save_CXX"
53 ] 54 ]
54 ) 55 )
55 CXX="$save_CXX" 56 CXX="$save_CXX"
56fi 57fi
57AC_SUBST(LINKER,[$LINKER]) 58AC_SUBST(LINKER,[$LINKER])
66 else 67 else
67 CXXFLAGS="-O" 68 CXXFLAGS="-O"
68 fi 69 fi
69 CFLAGS="$CXXFLAGS" 70 CFLAGS="$CXXFLAGS"
70fi 71fi
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 72
78dnl# FreeBSD needs to link libxpg4 73dnl# FreeBSD needs to link libxpg4
79AC_SEARCH_LIBS(setlocale, xpg4) 74AC_SEARCH_LIBS(setlocale, xpg4)
80 75
81dnl# solaris needs to link libnsl and socket 76dnl# solaris needs to link libnsl and socket
95support_scroll_next=yes 90support_scroll_next=yes
96support_scroll_xterm=yes 91support_scroll_xterm=yes
97support_xim=yes 92support_xim=yes
98support_pixbuf=yes 93support_pixbuf=yes
99support_startup_notification=yes 94support_startup_notification=yes
100support_afterimage=yes
101support_xft=yes 95support_xft=yes
102support_unicode3=no 96support_unicode3=no
103support_combining=yes 97support_combining=yes
104support_8bitctrls=no 98support_8bitctrls=no
105support_iso14755=yes 99support_iso14755=yes
132 support_utmp=no 126 support_utmp=no
133 support_wtmp=no 127 support_wtmp=no
134 support_xim=no 128 support_xim=no
135 support_pixbuf=no 129 support_pixbuf=no
136 support_startup_notification=no 130 support_startup_notification=no
137 support_afterimage=no
138 support_xft=no 131 support_xft=no
139 support_unicode3=no 132 support_unicode3=no
140 support_combining=no 133 support_combining=no
141 support_8bitctrls=no 134 support_8bitctrls=no
142 support_iso14755=no 135 support_iso14755=no
161 support_utmp=yes 154 support_utmp=yes
162 support_wtmp=yes 155 support_wtmp=yes
163 support_xim=yes 156 support_xim=yes
164 support_pixbuf=yes 157 support_pixbuf=yes
165 support_startup_notification=yes 158 support_startup_notification=yes
166 support_afterimage=yes
167 support_xft=yes 159 support_xft=yes
168 support_unicode3=yes 160 support_unicode3=yes
169 support_combining=yes 161 support_combining=yes
170 #support_8bitctrls=yes 162 #support_8bitctrls=yes
171 support_iso14755=yes 163 support_iso14755=yes
173 support_perl=yes 165 support_perl=yes
174 codesets=all 166 codesets=all
175 fi 167 fi
176 ]) 168 ])
177 169
178ASSERTIONS=no 170support_assertions=no
179AC_ARG_ENABLE(assert, 171AC_ARG_ENABLE(assert,
180 [ --enable-assert enable assertions], 172 [ --enable-assert enable assertions],
181 [if test x$enableval = xyes; then 173 [if test x$enableval = xyes; then
182 ASSERTIONS=yes 174 support_assertions=yes
183 fi]) 175 fi])
184if test x$ASSERTIONS = xno; then 176if test x$support_assertions = xno; then
185 AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging)) 177 AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging))
186fi 178fi
187 179
188WARNINGS=no 180support_warnings=no
189AC_ARG_ENABLE(warnings, 181AC_ARG_ENABLE(warnings,
190 [ --enable-warnings turn on g++ warnings], 182 [ --enable-warnings turn on g++ warnings],
191 [if test x$enableval = xyes; then 183 [if test x$enableval = xyes; then
192 WARNINGS=yes 184 support_warnings=yes
193 fi]) 185 fi])
194if test x$GXX = xyes; then 186if test x$GXX = xyes; then
195 if test $WARNINGS = yes; then 187 if test $support_warnings = yes; then
196 save_CXXFLAGS="$CXXFLAGS" 188 save_CXXFLAGS="$CXXFLAGS"
197 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor" 189 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-unused-value"
198 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"]) 190 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"])
199 else 191 else
200 CXXFLAGS="$CXXFLAGS -w" 192 CXXFLAGS="$CXXFLAGS -w"
201 fi 193 fi
202fi 194fi
233 [ --enable-font-styles enable bold and italic support], 225 [ --enable-font-styles enable bold and italic support],
234 [if test x$enableval = xyes -o x$enableval = xno; then 226 [if test x$enableval = xyes -o x$enableval = xno; then
235 support_styles=$enableval 227 support_styles=$enableval
236 fi]) 228 fi])
237 229
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, 230AC_ARG_ENABLE(pixbuf,
251 [ --enable-pixbuf enable integration with gdk-pixbuf for background images], 231 [ --enable-pixbuf enable integration with gdk-pixbuf for background images],
252 [if test x$enableval = xyes -o x$enableval = xno; then 232 [if test x$enableval = xyes -o x$enableval = xno; then
253 support_pixbuf=$enableval 233 support_pixbuf=$enableval
254 fi]) 234 fi])
315 [ --disable-delete-key disable handling of the delete key], 295 [ --disable-delete-key disable handling of the delete key],
316 [if test x$enableval = xno; then 296 [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) 297 AC_DEFINE(NO_DELETE_KEY, 1, Define if you don't want support for the (non-keypad) delete key)
318 fi]) 298 fi])
319 299
300support_resources=yes
320AC_ARG_ENABLE(resources, 301AC_ARG_ENABLE(resources,
321 [ --disable-resources disable all resource checking], 302 [ --disable-resources disable all resource checking],
322 [if test x$enableval = xno; then 303 [if test x$enableval = xno; then
323 AC_DEFINE(NO_RESOURCES, 1, Define if you don't want any resources read) 304 support_resources=no
324 fi]) 305 fi])
325 306
326AC_ARG_ENABLE(8bitctrls, 307AC_ARG_ENABLE(8bitctrls,
327 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)], 308 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)],
328 [if test x$enableval = xyes -o x$enableval = xno; then 309 [if test x$enableval = xyes -o x$enableval = xno; then
432 [ --with-terminfo=PATH set the path to the terminfo tree to PATH], 413 [ --with-terminfo=PATH set the path to the terminfo tree to PATH],
433 [if test x$withval != x; then 414 [if test x$withval != x; then
434 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" 415 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
435 fi]) 416 fi])
436 417
418if test x$support_resources = xno; then
419 if test x$support_frills = xyes || test x$support_perl = xyes; then
420 AC_MSG_ERROR([--disable-resources requires --disable-frills --disable-perl])
421 fi
422
423 AC_DEFINE(NO_RESOURCES, 1, Define if you don't want any resources read)
424fi
425
437dnl# -------------------------------------------------------------------------- 426dnl# --------------------------------------------------------------------------
438 427
439LIBEV_M4_AVOID_LIBRT=1 428LIBEV_M4_AVOID_LIBRT=1
440m4_include([libev/libev.m4]) 429m4_include([libev/libev.m4])
441 430
443 432
444AC_PATH_PROG(TIC, tic, :) 433AC_PATH_PROG(TIC, tic, :)
445 434
446AC_PATH_XTRA 435AC_PATH_XTRA
447 436
437AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
438
439RXVT_CHECK_MODULES([PTYTTY], [libptytty], [:], [
440 AC_MSG_ERROR([unable to find libptytty])
441])
442
443AC_SUBST(PTYTTY_CFLAGS)
444AC_SUBST(PTYTTY_LIBS)
445
448image_lib=none 446image_lib=none
449 447
450PIXBUF_CFLAGS= 448PIXBUF_CFLAGS=
451PIXBUF_LIBS= 449PIXBUF_LIBS=
452 450
453if test x$support_pixbuf = xyes; then 451if test x$support_pixbuf = xyes; then
454 support_pixbuf=no 452 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 453 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) 454 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.) 455 ], [:])
469 else
470 AC_MSG_RESULT(no)
471 fi
472fi 456fi
473 457
474AC_SUBST(PIXBUF_CFLAGS) 458AC_SUBST(PIXBUF_CFLAGS)
475AC_SUBST(PIXBUF_LIBS) 459AC_SUBST(PIXBUF_LIBS)
476 460
477STARTUP_NOTIFICATION_CFLAGS= 461STARTUP_NOTIFICATION_CFLAGS=
478STARTUP_NOTIFICATION_LIBS= 462STARTUP_NOTIFICATION_LIBS=
479 463
480if test x$support_startup_notification = xyes; then 464if test x$support_startup_notification = xyes; then
481 support_startup_notification=no 465 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) 466 AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, Define if freedesktop startup notifications should be supported)
493 else 467 ], [:])
494 AC_MSG_RESULT(no)
495 fi
496fi 468fi
497 469
498AC_SUBST(STARTUP_NOTIFICATION_CFLAGS) 470AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
499AC_SUBST(STARTUP_NOTIFICATION_LIBS) 471AC_SUBST(STARTUP_NOTIFICATION_LIBS)
500 472
501AFTERIMAGE_CFLAGS=
502AFTERIMAGE_LIBS=
503AFTERIMAGE_VERSION=
504
505if test x$support_afterimage = xyes; then 473if test x$support_frills = xyes; then
506 support_afterimage=no 474 RXVT_CHECK_MODULES([XMU], [xmu], [
507 475 X_LIBS="$XMU_LIBS $X_LIBS"
508 if test "x$afterimage_config" = "x" ; then 476 CPPFLAGS="$CPPFLAGS $XMU_CFLAGS"
509 AC_PATH_PROG(afterimage_config, afterimage-config, no) 477 AC_DEFINE(HAVE_XMU, 1, Define to enable Xmu support)
510 fi 478 ], [:])
511 if test "x$afterimage_config" != "xno" ; then
512 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
513 xAFTERIMAGE_VERSION=`$afterimage_config --version`
514 if test -n "$xAFTERIMAGE_VERSION" ; then
515 xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
516 xAFTERIMAGE_LIBS=`$afterimage_config --libs`
517 if test "x$xAFTERIMAGE_LIBS" != "x"; then
518 libai_ver_major=`echo $xAFTERIMAGE_VERSION | cut -f 1 -d .`
519 libai_ver_minor=`echo $xAFTERIMAGE_VERSION | cut -f 2 -d .`
520 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then
521 support_afterimage=yes
522 AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS"
523 AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS"
524 AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION"
525 fi
526 fi
527 fi
528 if test "x$support_afterimage" = "xyes"; then
529 AC_MSG_RESULT($AFTERIMAGE_LIBS)
530 image_lib=libafterimage
531 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
532 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
533 else
534 AC_MSG_RESULT(no)
535 fi
536 fi
537fi 479fi
538
539AC_SUBST(AFTERIMAGE_CFLAGS)
540AC_SUBST(AFTERIMAGE_LIBS)
541 480
542dnl# -------------------------------------------------------------------------- 481dnl# --------------------------------------------------------------------------
543dnl# CHECKING FOR HEADER FILES 482dnl# CHECKING FOR HEADER FILES
544dnl# -------------------------------------------------------------------------- 483dnl# --------------------------------------------------------------------------
545AC_CHECK_HEADERS( \ 484AC_CHECK_HEADERS( \
547 sys/ioctl.h \ 486 sys/ioctl.h \
548 sys/sockio.h \ 487 sys/sockio.h \
549 sys/strredir.h \ 488 sys/strredir.h \
550 stdint.h \ 489 stdint.h \
551 wchar.h \ 490 wchar.h \
552 cwchar \
553) 491)
554 492
555AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access, 493AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
556[AC_COMPILE_IFELSE( 494[AC_COMPILE_IFELSE(
557 [AC_LANG_PROGRAM([ 495 [AC_LANG_PROGRAM([
582dnl# -------------------------------------------------------------------------- 520dnl# --------------------------------------------------------------------------
583dnl# CHECKING FOR LIBRARY FUNCTIONS 521dnl# CHECKING FOR LIBRARY FUNCTIONS
584dnl# -------------------------------------------------------------------------- 522dnl# --------------------------------------------------------------------------
585AC_CHECK_FUNCS(unsetenv) 523AC_CHECK_FUNCS(unsetenv)
586 524
587UTMP_CHECK
588
589dnl# -------------------------------------------------------------------------- 525dnl# --------------------------------------------------------------------------
590 526
591dnl# -------------------------------------------------------------------------- 527dnl# --------------------------------------------------------------------------
592dnl# -------------------------------------------------------------------------- 528dnl# --------------------------------------------------------------------------
593 529
594dnl# this is a really hack test for some basic Xlocale stuff 530dnl# this is a really hack test for some basic Xlocale stuff
595save_LIBS=$LIBS 531save_LIBS=$LIBS
596save_CFLAGS=$CFLAGS 532save_CXXFLAGS=$CXXFLAGS
597CFLAGS="$CFLAGS $X_CFLAGS" 533CXXFLAGS="$CXXFLAGS $X_CFLAGS"
598LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 534LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
599if test x$support_xim = xyes; then 535if test x$support_xim = xyes; then
600 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 536 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
601 [AC_RUN_IFELSE([AC_LANG_SOURCE([[ 537 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
602 #include <X11/Xlib.h> 538 #include <X11/Xlib.h>
634#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) 570#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
635if test x$rxvt_cv_func_xsetlocale = xyes; then 571if test x$rxvt_cv_func_xsetlocale = xyes; then
636 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 572 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
637fi 573fi
638LIBS=$save_LIBS 574LIBS=$save_LIBS
639CFLAGS=$save_CFLAGS 575CXXFLAGS=$save_CXXFLAGS
640
641AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
642[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])
643if test x$rxvt_cv_func_setlocale = xyes; then
644 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
645fi
646 576
647AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo, 577AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,
648[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])]) 578[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])])
649if test x$rxvt_cv_func_nl_langinfo = xyes; then 579if test x$rxvt_cv_func_nl_langinfo = xyes; then
650 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) 580 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
651fi 581fi
652 582
653SCM_RIGHTS_CHECK
654
655PTY_CHECK
656
657TTY_GROUP_CHECK
658
659dnl# -------------------------------------------------------------------------- 583dnl# --------------------------------------------------------------------------
660dnl# now add and remove other stuff 584dnl# now add and remove other stuff
661dnl# -------------------------------------------------------------------------- 585dnl# --------------------------------------------------------------------------
586support_image=no
587if test x$support_inheritpixmap = xyes || test x$support_pixbuf = xyes; then
588 support_image=yes
589fi
662if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then 590if test x$support_xft = xyes || test x$support_image = xyes; then
663 rxvt_have_xrender=no 591 rxvt_have_xrender=no
664 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 592 RXVT_CHECK_MODULES([XRENDER], [xrender], [
665 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then 593 X_LIBS="$XRENDER_LIBS $X_LIBS"
666 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS" 594 CPPFLAGS="$CPPFLAGS $XRENDER_CFLAGS"
667 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
668 rxvt_have_xrender=yes 595 rxvt_have_xrender=yes
669 596
670 save_LIBS="$LIBS" 597 save_LIBS="$LIBS"
671 LIBS="$LIBS $X_LIBS" 598 LIBS="$LIBS $X_LIBS"
672 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no]) 599 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no])
673 AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no]) 600 AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no])
674 LIBS="$save_LIBS" 601 LIBS="$save_LIBS"
675 fi 602 ], [:])
676fi 603fi
677 604
678if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then 605if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then
679 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 606 RXVT_CHECK_MODULES([XFT], [fontconfig xft], [
680 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 607 X_LIBS="$XFT_LIBS $X_LIBS"
681 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 608 CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
682 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 609 ], [
683 else
684 AC_PATH_PROG(XFT_CONFIG, xft-config, no) 610 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
685 if test $XFT_CONFIG != no; then 611 if test $XFT_CONFIG != no; then
686 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 612 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
687 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 613 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
688 fi 614 fi
689 fi 615 ])
690
691 if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then
692 X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS"
693 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
694 fi
695 616
696 save_LIBS="$LIBS" 617 save_LIBS="$LIBS"
697 LIBS="$LIBS $X_LIBS" 618 LIBS="$LIBS $X_LIBS"
698 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
699 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
700 AC_CHECK_HEADERS(fontconfig/fontconfig.h,,[support_xft=no]) 619 AC_CHECK_HEADERS(X11/Xft/Xft.h fontconfig/fontconfig.h,,[support_xft=no])
701 AC_CHECK_LIB(fontconfig,FcPatternGet,:,[support_xft=no]) 620 AC_CHECK_FUNCS(XftDrawString32 FcPatternGet,,[support_xft=no])
702 LIBS="$save_LIBS" 621 LIBS="$save_LIBS"
703 622
704 if test x$support_xft = xyes; then 623 if test x$support_xft = xyes; then
705 AC_DEFINE(XFT, 1, Define to enable xft support) 624 AC_DEFINE(XFT, 1, Define to enable xft support)
706 fi 625 fi
707fi 626fi
627
628if test x$support_image = xyes && test x$rxvt_have_xrender = xyes; then
629 AC_MSG_CHECKING(for Render >= 0.11)
630 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
631#include <X11/extensions/Xrender.h>
632#if RENDER_MAJOR == 0 && RENDER_MINOR <= 10
633error
634#endif
635]])],[],[support_image=no])
636 if test x$support_image = xyes; then
637 AC_MSG_RESULT(ok)
638 LIBS="$LIBS -lm"
639 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
640
641 if test x$support_inheritpixmap = xyes; then
642 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
643 fi
644 else
645 AC_MSG_RESULT(no)
646 fi
647fi
648
708if test x$support_styles = xyes; then 649if test x$support_styles = xyes; then
709 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support) 650 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
710fi 651fi
711if test x$support_iso14755 = xyes; then 652if test x$support_iso14755 = xyes; then
712 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support) 653 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
714if test x$support_8bitctrls = xyes; then 655if test x$support_8bitctrls = xyes; then
715 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences) 656 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
716fi 657fi
717if test x$support_fading = xyes; then 658if test x$support_fading = xyes; then
718 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) 659 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
719fi
720if test x$support_inheritpixmap = xyes; then
721 if test x$rxvt_have_xrender = xyes; then
722 LIBS="$LIBS -lm"
723 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
724 fi
725 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
726fi 660fi
727if test x$support_keepscrolling = xno; then 661if test x$support_keepscrolling = xno; then
728 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) 662 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
729fi 663fi
730if test x$support_selectionscrolling = xyes; then 664if test x$support_selectionscrolling = xyes; then
782 esac 716 esac
783done 717done
784 718
785IF_PERL=\# 719IF_PERL=\#
786if test x$support_perl = xyes; then 720if test x$support_perl = xyes; then
787 AC_PATH_PROG(PERL, perl5) 721 AC_PATH_PROG(PERL, perl5, perl)
788 AC_PATH_PROG(PERL, perl)
789 722
790 AC_MSG_CHECKING(for $PERL suitability) 723 AC_MSG_CHECKING(for $PERL suitability)
791 if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then 724 if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then
792 725
793 save_CXXFLAGS="$CXXFLAGS" 726 save_CXXFLAGS="$CXXFLAGS"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines