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.132 by sf-exg, Wed Dec 14 12:03:04 2011 UTC vs.
Revision 1.158 by sf-exg, Sun Nov 7 14:13:40 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
10AC_CANONICAL_HOST
11 9
12dnl RXVT version 10dnl RXVT version
13changequote(, )dnl
14VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 11VERSION=`sed -n -e 's/^.* VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
15DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 12DATE=`sed -n -e 's/^.* DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
16changequote([, ])dnl
17AC_SUBST(VERSION)dnl 13AC_SUBST(VERSION)dnl
18AC_SUBST(DATE)dnl 14AC_SUBST(DATE)dnl
19 15
20echo "" 16echo ""
21echo "configuring for rxvt $VERSION" 17echo "configuring for rxvt $VERSION"
… …
24orig_CXXFLAGS="$CXXFLAGS" 20orig_CXXFLAGS="$CXXFLAGS"
25 21
26dnl# Checks for programs. 22dnl# Checks for programs.
27AC_PROG_CC 23AC_PROG_CC
28AC_PROG_CXX 24AC_PROG_CXX
29AC_PROG_CPP
30AC_PROG_INSTALL 25AC_PROG_INSTALL
31 26
32AC_AIX 27AC_USE_SYSTEM_EXTENSIONS
33AC_GNU_SOURCE
34AC_ISC_POSIX
35AC_LANG(C++) 28AC_LANG(C++)
36 29
30if test "$ac_prog_cxx_stdcxx" != cxx11; then
31 AC_MSG_ERROR([the compiler does not support C++11])
32fi
33
34LINKER="$CXX"
37dnl check whether we can link with gcc -lsupc++ 35dnl check whether we can link with gcc -lsupc++
38if test x$GCC = xyes && test x$GXX = xyes; then 36if test x$GCC = xyes && test x$GXX = xyes; then
39 dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it 37 dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it
40 AC_MSG_CHECKING([for working libsupc++]) 38 AC_MSG_CHECKING([for working libsupc++])
41 save_CXX="$CXX" 39 save_CXX="$CXX"
42 save_LIBS="$LIBS" 40 save_LIBS="$LIBS"
43 CXX="$CC" 41 CXX="$CC"
44 LIBS="$LIBS -lsupc++" 42 LIBS="$LIBS -lsupc++"
45 LINKER="$CC"
46 AC_LINK_IFELSE( 43 AC_LINK_IFELSE(
47 [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])], 44 [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])],
48 [AC_MSG_RESULT(ok)], 45 [AC_MSG_RESULT(ok)
46 LINKER="$CC"],
49 [ 47 [
50 AC_MSG_RESULT([no, making everything bigger and slower]) 48 AC_MSG_RESULT([no, making everything bigger and slower])
51 LIBS="$save_LIBS" 49 LIBS="$save_LIBS"
52 LINKER="$save_CXX"
53 ] 50 ]
54 ) 51 )
55 CXX="$save_CXX" 52 CXX="$save_CXX"
56fi 53fi
57AC_SUBST(LINKER,[$LINKER]) 54AC_SUBST(LINKER,[$LINKER])
… …
66 else 63 else
67 CXXFLAGS="-O" 64 CXXFLAGS="-O"
68 fi 65 fi
69 CFLAGS="$CXXFLAGS" 66 CFLAGS="$CXXFLAGS"
70fi 67fi
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 68
78dnl# FreeBSD needs to link libxpg4 69dnl# FreeBSD needs to link libxpg4
79AC_SEARCH_LIBS(setlocale, xpg4) 70AC_SEARCH_LIBS(setlocale, xpg4)
80 71
81dnl# solaris needs to link libnsl and socket 72dnl# solaris needs to link libnsl and socket
… …
118 support_frills=no 109 support_frills=no
119 support_inheritpixmap=no 110 support_inheritpixmap=no
120 support_fading=no 111 support_fading=no
121 support_keepscrolling=no 112 support_keepscrolling=no
122 support_selectionscrolling=no 113 support_selectionscrolling=no
123 support_lastlog=no
124 support_mousewheel=no 114 support_mousewheel=no
125 support_mouseslipwheel=no 115 support_mouseslipwheel=no
126 support_text_blink=no 116 support_text_blink=no
127 support_pointer_blank=no 117 support_pointer_blank=no
128 support_scroll_rxvt=no 118 support_scroll_rxvt=no
129 support_scroll_next=no 119 support_scroll_next=no
130 support_scroll_xterm=no 120 support_scroll_xterm=no
131 support_utmp=no
132 support_wtmp=no
133 support_xim=no 121 support_xim=no
134 support_pixbuf=no 122 support_pixbuf=no
135 support_startup_notification=no 123 support_startup_notification=no
136 support_xft=no 124 support_xft=no
137 support_unicode3=no 125 support_unicode3=no
… …
146 support_frills=yes 134 support_frills=yes
147 support_inheritpixmap=yes 135 support_inheritpixmap=yes
148 support_fading=yes 136 support_fading=yes
149 support_keepscrolling=yes 137 support_keepscrolling=yes
150 support_selectionscrolling=yes 138 support_selectionscrolling=yes
151 support_lastlog=yes
152 support_mousewheel=yes 139 support_mousewheel=yes
153 support_mouseslipwheel=yes 140 support_mouseslipwheel=yes
154 support_text_blink=yes 141 support_text_blink=yes
155 support_pointer_blank=yes 142 support_pointer_blank=yes
156 support_scroll_rxvt=yes 143 support_scroll_rxvt=yes
157 support_scroll_next=yes 144 support_scroll_next=yes
158 support_scroll_xterm=yes 145 support_scroll_xterm=yes
159 support_utmp=yes
160 support_wtmp=yes
161 support_xim=yes 146 support_xim=yes
162 support_pixbuf=yes 147 support_pixbuf=yes
163 support_startup_notification=yes 148 support_startup_notification=yes
164 support_xft=yes 149 support_xft=yes
165 support_unicode3=yes 150 support_unicode3=yes
… …
170 support_perl=yes 155 support_perl=yes
171 codesets=all 156 codesets=all
172 fi 157 fi
173 ]) 158 ])
174 159
175ASSERTIONS=no 160support_assertions=no
176AC_ARG_ENABLE(assert, 161AC_ARG_ENABLE(assert,
177 [ --enable-assert enable assertions], 162 [ --enable-assert enable assertions],
178 [if test x$enableval = xyes; then 163 [if test x$enableval = xyes; then
179 ASSERTIONS=yes 164 support_assertions=yes
180 fi]) 165 fi])
181if test x$ASSERTIONS = xno; then 166if test x$support_assertions = xno; then
182 AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging)) 167 AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging))
183fi 168fi
184 169
185WARNINGS=no 170support_warnings=no
186AC_ARG_ENABLE(warnings, 171AC_ARG_ENABLE(warnings,
187 [ --enable-warnings turn on g++ warnings], 172 [ --enable-warnings turn on g++ warnings],
188 [if test x$enableval = xyes; then 173 [if test x$enableval = xyes; then
189 WARNINGS=yes 174 support_warnings=yes
190 fi]) 175 fi])
191if test x$GXX = xyes; then 176if test x$GXX = xyes; then
192 if test $WARNINGS = yes; then 177 if test $support_warnings = yes; then
193 save_CXXFLAGS="$CXXFLAGS" 178 save_CXXFLAGS="$CXXFLAGS"
194 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor" 179 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-unused-value"
195 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"]) 180 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"])
196 else 181 else
197 CXXFLAGS="$CXXFLAGS -w" 182 CXXFLAGS="$CXXFLAGS -w"
198 fi 183 fi
199fi 184fi
… …
230 [ --enable-font-styles enable bold and italic support], 215 [ --enable-font-styles enable bold and italic support],
231 [if test x$enableval = xyes -o x$enableval = xno; then 216 [if test x$enableval = xyes -o x$enableval = xno; then
232 support_styles=$enableval 217 support_styles=$enableval
233 fi]) 218 fi])
234 219
235AC_ARG_ENABLE(afterimage,
236 [ --enable-afterimage enable integration with libAfterImage for background images (deprecated)],
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, 220AC_ARG_ENABLE(pixbuf,
248 [ --enable-pixbuf enable integration with gdk-pixbuf for background images], 221 [ --enable-pixbuf enable integration with gdk-pixbuf for background images],
249 [if test x$enableval = xyes -o x$enableval = xno; then 222 [if test x$enableval = xyes -o x$enableval = xno; then
250 support_pixbuf=$enableval 223 support_pixbuf=$enableval
251 fi]) 224 fi])
… …
312 [ --disable-delete-key disable handling of the delete key], 285 [ --disable-delete-key disable handling of the delete key],
313 [if test x$enableval = xno; then 286 [if test x$enableval = xno; then
314 AC_DEFINE(NO_DELETE_KEY, 1, Define if you don't want support for the (non-keypad) delete key) 287 AC_DEFINE(NO_DELETE_KEY, 1, Define if you don't want support for the (non-keypad) delete key)
315 fi]) 288 fi])
316 289
290support_resources=yes
317AC_ARG_ENABLE(resources, 291AC_ARG_ENABLE(resources,
318 [ --disable-resources disable all resource checking], 292 [ --disable-resources disable all resource checking],
319 [if test x$enableval = xno; then 293 [if test x$enableval = xno; then
320 AC_DEFINE(NO_RESOURCES, 1, Define if you don't want any resources read) 294 support_resources=no
321 fi]) 295 fi])
322 296
323AC_ARG_ENABLE(8bitctrls, 297AC_ARG_ENABLE(8bitctrls,
324 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)], 298 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)],
325 [if test x$enableval = xyes -o x$enableval = xno; then 299 [if test x$enableval = xyes -o x$enableval = xno; then
… …
429 [ --with-terminfo=PATH set the path to the terminfo tree to PATH], 403 [ --with-terminfo=PATH set the path to the terminfo tree to PATH],
430 [if test x$withval != x; then 404 [if test x$withval != x; then
431 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" 405 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
432 fi]) 406 fi])
433 407
408if test x$support_resources = xno; then
409 if test x$support_frills = xyes || test x$support_perl = xyes; then
410 AC_MSG_ERROR([--disable-resources requires --disable-frills --disable-perl])
411 fi
412
413 AC_DEFINE(NO_RESOURCES, 1, Define if you don't want any resources read)
414fi
415
434dnl# -------------------------------------------------------------------------- 416dnl# --------------------------------------------------------------------------
435 417
436LIBEV_M4_AVOID_LIBRT=1 418LIBEV_M4_AVOID_LIBRT=1
437m4_include([libev/libev.m4]) 419m4_include([libev/libev.m4])
438 420
… …
440 422
441AC_PATH_PROG(TIC, tic, :) 423AC_PATH_PROG(TIC, tic, :)
442 424
443AC_PATH_XTRA 425AC_PATH_XTRA
444 426
427AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
428
429RXVT_CHECK_MODULES([PTYTTY], [libptytty], [:], [
430 AC_MSG_ERROR([unable to find libptytty])
431])
432
433AC_SUBST(PTYTTY_CFLAGS)
434AC_SUBST(PTYTTY_LIBS)
435
445image_lib=none 436image_lib=none
446 437
447PIXBUF_CFLAGS= 438PIXBUF_CFLAGS=
448PIXBUF_LIBS= 439PIXBUF_LIBS=
449 440
450if test x$support_pixbuf = xyes; then 441if test x$support_pixbuf = xyes; then
451 support_pixbuf=no 442 RXVT_CHECK_MODULES([PIXBUF], [gdk-pixbuf-2.0], [
452 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
453 AC_MSG_CHECKING(for gdk-pixbuf)
454 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then
455 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
456 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
457 support_pixbuf=yes
458 fi
459
460 if test x$support_pixbuf = xyes; then
461 AC_MSG_RESULT(ok)
462 image_lib=gdk-pixbuf 443 image_lib=gdk-pixbuf
463 support_afterimage=no
464 AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing) 444 AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing)
465 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.) 445 ], [:])
466 else
467 AC_MSG_RESULT(no)
468 fi
469fi 446fi
470 447
471AC_SUBST(PIXBUF_CFLAGS) 448AC_SUBST(PIXBUF_CFLAGS)
472AC_SUBST(PIXBUF_LIBS) 449AC_SUBST(PIXBUF_LIBS)
473 450
474STARTUP_NOTIFICATION_CFLAGS= 451STARTUP_NOTIFICATION_CFLAGS=
475STARTUP_NOTIFICATION_LIBS= 452STARTUP_NOTIFICATION_LIBS=
476 453
477if test x$support_startup_notification = xyes; then 454if test x$support_startup_notification = xyes; then
478 support_startup_notification=no 455 RXVT_CHECK_MODULES([STARTUP_NOTIFICATION], [libstartup-notification-1.0], [
479 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
480 AC_MSG_CHECKING(for libstartup-notification)
481 if test $PKG_CONFIG != no && $PKG_CONFIG --exists libstartup-notification-1.0; then
482 STARTUP_NOTIFICATION_CFLAGS="`$PKG_CONFIG libstartup-notification-1.0 --cflags`"
483 STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG libstartup-notification-1.0 --libs`"
484 support_startup_notification=yes
485 fi
486
487 if test x$support_startup_notification = xyes; then
488 AC_MSG_RESULT(ok)
489 AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, Define if freedesktop startup notifications should be supported) 456 AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, Define if freedesktop startup notifications should be supported)
490 else 457 ], [:])
491 AC_MSG_RESULT(no)
492 fi
493fi 458fi
494 459
495AC_SUBST(STARTUP_NOTIFICATION_CFLAGS) 460AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
496AC_SUBST(STARTUP_NOTIFICATION_LIBS) 461AC_SUBST(STARTUP_NOTIFICATION_LIBS)
497 462
498AFTERIMAGE_CFLAGS=
499AFTERIMAGE_LIBS=
500
501if test x$support_afterimage = xyes; then 463if test x$support_frills = xyes; then
502 support_afterimage=no 464 RXVT_CHECK_MODULES([XMU], [xmu], [
503 465 X_LIBS="$XMU_LIBS $X_LIBS"
504 if test "x$afterimage_config" = "x" ; then 466 CPPFLAGS="$CPPFLAGS $XMU_CFLAGS"
505 AC_PATH_PROG(afterimage_config, afterimage-config, no) 467 AC_DEFINE(HAVE_XMU, 1, Define to enable Xmu support)
506 fi 468 ], [:])
507 if test "x$afterimage_config" != "xno" ; then
508 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
509 AFTERIMAGE_VERSION=`$afterimage_config --version`
510 if test -n "$AFTERIMAGE_VERSION" ; then
511 AFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
512 AFTERIMAGE_LIBS=`$afterimage_config --libs`
513 if test "x$AFTERIMAGE_LIBS" != "x"; then
514 libai_ver_major=`echo $AFTERIMAGE_VERSION | cut -f 1 -d .`
515 libai_ver_minor=`echo $AFTERIMAGE_VERSION | cut -f 2 -d .`
516 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then
517 support_afterimage=yes
518 fi
519 fi
520 fi
521 if test "x$support_afterimage" = "xyes"; then
522 AC_MSG_RESULT($AFTERIMAGE_LIBS)
523 image_lib=libafterimage
524 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
525 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
526 else
527 AC_MSG_RESULT(no)
528 AFTERIMAGE_CFLAGS=
529 AFTERIMAGE_LIBS=
530 fi
531 fi
532fi 469fi
533
534AC_SUBST(AFTERIMAGE_CFLAGS)
535AC_SUBST(AFTERIMAGE_LIBS)
536 470
537dnl# -------------------------------------------------------------------------- 471dnl# --------------------------------------------------------------------------
538dnl# CHECKING FOR HEADER FILES 472dnl# CHECKING FOR HEADER FILES
539dnl# -------------------------------------------------------------------------- 473dnl# --------------------------------------------------------------------------
540AC_CHECK_HEADERS( \ 474AC_CHECK_HEADERS( \
… …
542 sys/ioctl.h \ 476 sys/ioctl.h \
543 sys/sockio.h \ 477 sys/sockio.h \
544 sys/strredir.h \ 478 sys/strredir.h \
545 stdint.h \ 479 stdint.h \
546 wchar.h \ 480 wchar.h \
547 cwchar \
548) 481)
549 482
550AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access, 483AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
551[AC_COMPILE_IFELSE( 484[AC_COMPILE_IFELSE(
552 [AC_LANG_PROGRAM([ 485 [AC_LANG_PROGRAM([
… …
577dnl# -------------------------------------------------------------------------- 510dnl# --------------------------------------------------------------------------
578dnl# CHECKING FOR LIBRARY FUNCTIONS 511dnl# CHECKING FOR LIBRARY FUNCTIONS
579dnl# -------------------------------------------------------------------------- 512dnl# --------------------------------------------------------------------------
580AC_CHECK_FUNCS(unsetenv) 513AC_CHECK_FUNCS(unsetenv)
581 514
582UTMP_CHECK
583
584dnl# -------------------------------------------------------------------------- 515dnl# --------------------------------------------------------------------------
585 516
586dnl# -------------------------------------------------------------------------- 517dnl# --------------------------------------------------------------------------
587dnl# -------------------------------------------------------------------------- 518dnl# --------------------------------------------------------------------------
588 519
589dnl# this is a really hack test for some basic Xlocale stuff 520dnl# this is a really hack test for some basic Xlocale stuff
590save_LIBS=$LIBS 521save_LIBS=$LIBS
591save_CFLAGS=$CFLAGS 522save_CXXFLAGS=$CXXFLAGS
592CFLAGS="$CFLAGS $X_CFLAGS" 523CXXFLAGS="$CXXFLAGS $X_CFLAGS"
593LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 524LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
594if test x$support_xim = xyes; then 525if test x$support_xim = xyes; then
595 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 526 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
596 [AC_RUN_IFELSE([AC_LANG_SOURCE([[ 527 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
597 #include <X11/Xlib.h> 528 #include <X11/Xlib.h>
… …
629#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) 560#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
630if test x$rxvt_cv_func_xsetlocale = xyes; then 561if test x$rxvt_cv_func_xsetlocale = xyes; then
631 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 562 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
632fi 563fi
633LIBS=$save_LIBS 564LIBS=$save_LIBS
634CFLAGS=$save_CFLAGS 565CXXFLAGS=$save_CXXFLAGS
635
636AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
637[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])
638if test x$rxvt_cv_func_setlocale = xyes; then
639 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
640fi
641 566
642AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo, 567AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,
643[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])]) 568[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])])
644if test x$rxvt_cv_func_nl_langinfo = xyes; then 569if test x$rxvt_cv_func_nl_langinfo = xyes; then
645 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) 570 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
646fi 571fi
647 572
648SCM_RIGHTS_CHECK
649
650PTY_CHECK
651
652TTY_GROUP_CHECK
653
654dnl# -------------------------------------------------------------------------- 573dnl# --------------------------------------------------------------------------
655dnl# now add and remove other stuff 574dnl# now add and remove other stuff
656dnl# -------------------------------------------------------------------------- 575dnl# --------------------------------------------------------------------------
576support_image=no
577if test x$support_inheritpixmap = xyes || test x$support_pixbuf = xyes; then
578 support_image=yes
579fi
657if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then 580if test x$support_xft = xyes || test x$support_image = xyes; then
658 rxvt_have_xrender=no 581 rxvt_have_xrender=no
659 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 582 RXVT_CHECK_MODULES([XRENDER], [xrender], [
660 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then 583 X_LIBS="$XRENDER_LIBS $X_LIBS"
661 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS" 584 CPPFLAGS="$CPPFLAGS $XRENDER_CFLAGS"
662 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
663 rxvt_have_xrender=yes 585 rxvt_have_xrender=yes
664 586
665 save_LIBS="$LIBS" 587 save_LIBS="$LIBS"
666 LIBS="$LIBS $X_LIBS" 588 LIBS="$LIBS $X_LIBS"
667 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no]) 589 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no])
668 AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no]) 590 AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no])
669 LIBS="$save_LIBS" 591 LIBS="$save_LIBS"
670 fi 592 ], [:])
671fi 593fi
672 594
673if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then 595if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then
674 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 596 RXVT_CHECK_MODULES([XFT], [fontconfig xft], [
675 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 597 X_LIBS="$XFT_LIBS $X_LIBS"
676 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 598 CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
677 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 599 ], [
678 else
679 AC_PATH_PROG(XFT_CONFIG, xft-config, no) 600 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
680 if test $XFT_CONFIG != no; then 601 if test $XFT_CONFIG != no; then
681 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 602 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
682 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 603 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
683 fi 604 fi
684 fi 605 ])
685
686 if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then
687 X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS"
688 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
689 fi
690 606
691 save_LIBS="$LIBS" 607 save_LIBS="$LIBS"
692 LIBS="$LIBS $X_LIBS" 608 LIBS="$LIBS $X_LIBS"
693 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
694 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
695 AC_CHECK_HEADERS(fontconfig/fontconfig.h,,[support_xft=no]) 609 AC_CHECK_HEADERS(X11/Xft/Xft.h fontconfig/fontconfig.h,,[support_xft=no])
696 AC_CHECK_LIB(fontconfig,FcPatternGet,:,[support_xft=no]) 610 AC_CHECK_FUNCS(XftDrawString32 FcPatternGet,,[support_xft=no])
697 LIBS="$save_LIBS" 611 LIBS="$save_LIBS"
698 612
699 if test x$support_xft = xyes; then 613 if test x$support_xft = xyes; then
700 AC_DEFINE(XFT, 1, Define to enable xft support) 614 AC_DEFINE(XFT, 1, Define to enable xft support)
701 fi 615 fi
702fi 616fi
617
618if test x$support_image = xyes && test x$rxvt_have_xrender = xyes; then
619 AC_MSG_CHECKING(for Render >= 0.11)
620 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
621#include <X11/extensions/Xrender.h>
622#if RENDER_MAJOR == 0 && RENDER_MINOR <= 10
623error
624#endif
625]])],[],[support_image=no])
626 if test x$support_image = xyes; then
627 AC_MSG_RESULT(ok)
628 LIBS="$LIBS -lm"
629 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
630
631 if test x$support_inheritpixmap = xyes; then
632 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
633 fi
634 else
635 AC_MSG_RESULT(no)
636 fi
637fi
638
703if test x$support_styles = xyes; then 639if test x$support_styles = xyes; then
704 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support) 640 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
705fi 641fi
706if test x$support_iso14755 = xyes; then 642if test x$support_iso14755 = xyes; then
707 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support) 643 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
… …
709if test x$support_8bitctrls = xyes; then 645if test x$support_8bitctrls = xyes; then
710 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences) 646 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
711fi 647fi
712if test x$support_fading = xyes; then 648if test x$support_fading = xyes; then
713 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) 649 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
714fi
715if test x$support_inheritpixmap = xyes; then
716 if test x$rxvt_have_xrender = xyes; then
717 LIBS="$LIBS -lm"
718 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
719 fi
720 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
721fi 650fi
722if test x$support_keepscrolling = xno; then 651if test x$support_keepscrolling = xno; then
723 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) 652 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
724fi 653fi
725if test x$support_selectionscrolling = xyes; then 654if test x$support_selectionscrolling = xyes; then
… …
777 esac 706 esac
778done 707done
779 708
780IF_PERL=\# 709IF_PERL=\#
781if test x$support_perl = xyes; then 710if test x$support_perl = xyes; then
782 AC_PATH_PROG(PERL, perl5) 711 AC_PATH_PROG(PERL, perl5, perl)
783 AC_PATH_PROG(PERL, perl)
784 712
785 AC_MSG_CHECKING(for $PERL suitability) 713 AC_MSG_CHECKING(for $PERL suitability)
786 if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then 714 if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then
787 715
788 save_CXXFLAGS="$CXXFLAGS" 716 save_CXXFLAGS="$CXXFLAGS"

Diff Legend

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