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.120 by sf-exg, Sun Oct 31 08:28:01 2010 UTC vs.
Revision 1.140 by sf-exg, Thu Jan 19 18:17:32 2012 UTC

… …
9 9
10AC_CANONICAL_HOST 10AC_CANONICAL_HOST
11 11
12dnl RXVT version 12dnl RXVT version
13changequote(, )dnl 13changequote(, )dnl
14VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 14VERSION=`sed -n -e 's/^.* VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
15DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 15DATE=`sed -n -e 's/^.* DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
16changequote([, ])dnl 16changequote([, ])dnl
17AC_SUBST(VERSION)dnl 17AC_SUBST(VERSION)dnl
18AC_SUBST(DATE)dnl 18AC_SUBST(DATE)dnl
19 19
20echo "" 20echo ""
… …
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
… …
93support_pointer_blank=yes 86support_pointer_blank=yes
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_afterimage=yes 91support_pixbuf=yes
92support_startup_notification=yes
99support_xft=yes 93support_xft=yes
100support_unicode3=no 94support_unicode3=no
101support_combining=yes 95support_combining=yes
102support_8bitctrls=no 96support_8bitctrls=no
103support_iso14755=yes 97support_iso14755=yes
… …
128 support_scroll_next=no 122 support_scroll_next=no
129 support_scroll_xterm=no 123 support_scroll_xterm=no
130 support_utmp=no 124 support_utmp=no
131 support_wtmp=no 125 support_wtmp=no
132 support_xim=no 126 support_xim=no
133 support_afterimage=no 127 support_pixbuf=no
128 support_startup_notification=no
134 support_xft=no 129 support_xft=no
135 support_unicode3=no 130 support_unicode3=no
136 support_combining=no 131 support_combining=no
137 support_8bitctrls=no 132 support_8bitctrls=no
138 support_iso14755=no 133 support_iso14755=no
… …
155 support_scroll_next=yes 150 support_scroll_next=yes
156 support_scroll_xterm=yes 151 support_scroll_xterm=yes
157 support_utmp=yes 152 support_utmp=yes
158 support_wtmp=yes 153 support_wtmp=yes
159 support_xim=yes 154 support_xim=yes
160 support_afterimage=yes 155 support_pixbuf=yes
156 support_startup_notification=yes
161 support_xft=yes 157 support_xft=yes
162 support_unicode3=yes 158 support_unicode3=yes
163 support_combining=yes 159 support_combining=yes
164 #support_8bitctrls=yes 160 #support_8bitctrls=yes
165 support_iso14755=yes 161 support_iso14755=yes
… …
167 support_perl=yes 163 support_perl=yes
168 codesets=all 164 codesets=all
169 fi 165 fi
170 ]) 166 ])
171 167
172ASSERTIONS=no 168support_assertions=no
173AC_ARG_ENABLE(assert, 169AC_ARG_ENABLE(assert,
174 [ --enable-assert enable assertions], 170 [ --enable-assert enable assertions],
175 [if test x$enableval = xyes; then 171 [if test x$enableval = xyes; then
176 ASSERTIONS=yes 172 support_assertions=yes
177 fi]) 173 fi])
178if test x$ASSERTIONS = xno; then 174if test x$support_assertions = xno; then
179 AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging)) 175 AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging))
180fi 176fi
181 177
182WARNINGS=no 178support_warnings=no
183AC_ARG_ENABLE(warnings, 179AC_ARG_ENABLE(warnings,
184 [ --enable-warnings turn on g++ warnings], 180 [ --enable-warnings turn on g++ warnings],
185 [if test x$enableval = xyes; then 181 [if test x$enableval = xyes; then
186 WARNINGS=yes 182 support_warnings=yes
187 fi]) 183 fi])
188if test x$GXX = xyes; then 184if test x$GXX = xyes; then
189 if test $WARNINGS = yes; then 185 if test $support_warnings = yes; then
190 save_CXXFLAGS="$CXXFLAGS" 186 save_CXXFLAGS="$CXXFLAGS"
191 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor" 187 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-unused-value"
192 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"]) 188 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"])
193 else 189 else
194 CXXFLAGS="$CXXFLAGS -w" 190 CXXFLAGS="$CXXFLAGS -w"
195 fi 191 fi
196fi 192fi
… …
228 [if test x$enableval = xyes -o x$enableval = xno; then 224 [if test x$enableval = xyes -o x$enableval = xno; then
229 support_styles=$enableval 225 support_styles=$enableval
230 fi]) 226 fi])
231 227
232AC_ARG_ENABLE(afterimage, 228AC_ARG_ENABLE(afterimage,
233 [ --enable-afterimage enable integration with libAfterImage for background images], 229 [ --enable-afterimage enable integration with libAfterImage for background images (deprecated)],
234 [if test x$enableval = xyes -o x$enableval = xno; then 230 [if test x$enableval = xyes -o x$enableval = xno; then
235 support_afterimage=$enableval 231 support_afterimage=$enableval
236 fi]) 232 fi])
237 233
238AC_ARG_WITH(afterimage_config, 234AC_ARG_WITH(afterimage_config,
… …
243 239
244AC_ARG_ENABLE(pixbuf, 240AC_ARG_ENABLE(pixbuf,
245 [ --enable-pixbuf enable integration with gdk-pixbuf for background images], 241 [ --enable-pixbuf enable integration with gdk-pixbuf for background images],
246 [if test x$enableval = xyes -o x$enableval = xno; then 242 [if test x$enableval = xyes -o x$enableval = xno; then
247 support_pixbuf=$enableval 243 support_pixbuf=$enableval
244 fi])
245
246AC_ARG_ENABLE(startup-notification,
247 [ --enable-startup-notification enable freedesktop startup notification support],
248 [if test x$enableval = xyes -o x$enableval = xno; then
249 support_startup_notification=$enableval
248 fi]) 250 fi])
249 251
250AC_ARG_ENABLE(transparency, 252AC_ARG_ENABLE(transparency,
251 [ --enable-transparency enable transparent backgrounds], 253 [ --enable-transparency enable transparent backgrounds],
252 [if test x$enableval = xyes -o x$enableval = xno; then 254 [if test x$enableval = xyes -o x$enableval = xno; then
… …
440 442
441if test x$support_pixbuf = xyes; then 443if test x$support_pixbuf = xyes; then
442 support_pixbuf=no 444 support_pixbuf=no
443 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 445 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
444 AC_MSG_CHECKING(for gdk-pixbuf) 446 AC_MSG_CHECKING(for gdk-pixbuf)
445 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-xlib-2.0; then 447 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then
446 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --cflags`" 448 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
447 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --libs`" 449 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
448 support_pixbuf=yes 450 support_pixbuf=yes
449 fi 451 fi
450 452
451 if test x$support_pixbuf = xyes; then 453 if test x$support_pixbuf = xyes; then
452 AC_MSG_RESULT(ok) 454 AC_MSG_RESULT(ok)
… …
460fi 462fi
461 463
462AC_SUBST(PIXBUF_CFLAGS) 464AC_SUBST(PIXBUF_CFLAGS)
463AC_SUBST(PIXBUF_LIBS) 465AC_SUBST(PIXBUF_LIBS)
464 466
467STARTUP_NOTIFICATION_CFLAGS=
468STARTUP_NOTIFICATION_LIBS=
469
470if test x$support_startup_notification = xyes; then
471 support_startup_notification=no
472 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
473 AC_MSG_CHECKING(for libstartup-notification)
474 if test $PKG_CONFIG != no && $PKG_CONFIG --exists libstartup-notification-1.0; then
475 STARTUP_NOTIFICATION_CFLAGS="`$PKG_CONFIG libstartup-notification-1.0 --cflags`"
476 STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG libstartup-notification-1.0 --libs`"
477 support_startup_notification=yes
478 fi
479
480 if test x$support_startup_notification = xyes; then
481 AC_MSG_RESULT(ok)
482 AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, Define if freedesktop startup notifications should be supported)
483 else
484 AC_MSG_RESULT(no)
485 fi
486fi
487
488AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
489AC_SUBST(STARTUP_NOTIFICATION_LIBS)
490
465AFTERIMAGE_CFLAGS= 491AFTERIMAGE_CFLAGS=
466AFTERIMAGE_LIBS= 492AFTERIMAGE_LIBS=
467AFTERIMAGE_VERSION=
468 493
469if test x$support_afterimage = xyes; then 494if test x$support_afterimage = xyes; then
470 support_afterimage=no 495 support_afterimage=no
471 496
472 if test "x$afterimage_config" = "x" ; then 497 if test "x$afterimage_config" = "x" ; then
473 AC_PATH_PROG(afterimage_config, afterimage-config, no) 498 AC_PATH_PROG(afterimage_config, afterimage-config, no)
474 fi 499 fi
475 if test "x$afterimage_config" != "xno" ; then 500 if test "x$afterimage_config" != "xno" ; then
476 AC_MSG_CHECKING(for libAfterImage version >= 1.15) 501 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
477 xAFTERIMAGE_VERSION=`$afterimage_config --version` 502 AFTERIMAGE_VERSION=`$afterimage_config --version`
478 if test -n "$xAFTERIMAGE_VERSION" ; then 503 if test -n "$AFTERIMAGE_VERSION" ; then
479 xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 504 AFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
480 xAFTERIMAGE_LIBS=`$afterimage_config --libs` 505 AFTERIMAGE_LIBS=`$afterimage_config --libs`
481 if test "x$xAFTERIMAGE_LIBS" != "x"; then 506 if test "x$AFTERIMAGE_LIBS" != "x"; then
482 libai_ver_major=`echo $xAFTERIMAGE_VERSION | cut -f 1 -d .` 507 libai_ver_major=`echo $AFTERIMAGE_VERSION | cut -f 1 -d .`
483 libai_ver_minor=`echo $xAFTERIMAGE_VERSION | cut -f 2 -d .` 508 libai_ver_minor=`echo $AFTERIMAGE_VERSION | cut -f 2 -d .`
484 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then 509 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then
485 support_afterimage=yes 510 support_afterimage=yes
486 AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS"
487 AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS"
488 AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION"
489 fi 511 fi
490 fi 512 fi
491 fi 513 fi
492 if test "x$support_afterimage" = "xyes"; then 514 if test "x$support_afterimage" = "xyes"; then
493 AC_MSG_RESULT($AFTERIMAGE_LIBS) 515 AC_MSG_RESULT($AFTERIMAGE_LIBS)
494 image_lib=libafterimage 516 image_lib=libafterimage
495 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing) 517 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
496 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.) 518 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
497 else 519 else
498 AC_MSG_RESULT(no) 520 AC_MSG_RESULT(no)
521 AFTERIMAGE_CFLAGS=
522 AFTERIMAGE_LIBS=
499 fi 523 fi
500 fi 524 fi
501fi 525fi
502 526
503AC_SUBST(AFTERIMAGE_CFLAGS) 527AC_SUBST(AFTERIMAGE_CFLAGS)
… …
511 sys/ioctl.h \ 535 sys/ioctl.h \
512 sys/sockio.h \ 536 sys/sockio.h \
513 sys/strredir.h \ 537 sys/strredir.h \
514 stdint.h \ 538 stdint.h \
515 wchar.h \ 539 wchar.h \
516 cwchar \
517) 540)
518
519AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
520[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
521if test x$rxvt_cv_xpointer = xyes; then
522 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
523fi
524 541
525AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access, 542AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
526[AC_COMPILE_IFELSE( 543[AC_COMPILE_IFELSE(
527 [AC_LANG_PROGRAM([ 544 [AC_LANG_PROGRAM([
528#define XLIB_ILLEGAL_ACCESS 545#define XLIB_ILLEGAL_ACCESS
… …
566save_CFLAGS=$CFLAGS 583save_CFLAGS=$CFLAGS
567CFLAGS="$CFLAGS $X_CFLAGS" 584CFLAGS="$CFLAGS $X_CFLAGS"
568LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 585LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
569if test x$support_xim = xyes; then 586if test x$support_xim = xyes; then
570 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 587 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
571 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 588 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
589 #include <X11/Xlib.h>
572 #include <stdlib.h> 590 #include <stdlib.h>
573 main() { 591 int main() {
574 char *p; 592 char *p;
575 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 593 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
576 exit (XSupportsLocale() ? 0 : 1); 594 exit (XSupportsLocale() ? 0 : 1);
577 else 595 else
578 exit (1);}]])],[dnl 596 exit (1);
597 }
579 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 598 ]])],[rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[:])])
580 :])])
581 if test x$rxvt_cv_func_xlocale = xyes; then 599 if test x$rxvt_cv_func_xlocale = xyes; then
582 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input) 600 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
583 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb, 601 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
584 [AC_COMPILE_IFELSE([ 602 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
585 #include <X11/Xlib.h> 603 #include <X11/Xlib.h>
586 604
587 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); 605 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
588 606
589 void f() { 607 void f() {
590 XIMCallback cb; 608 XIMCallback cb;
591 cb.callback = im_destroy_cb; 609 cb.callback = im_destroy_cb;
592 } 610 }
593 ],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)]) 611 ]])],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
594 612
595 if test x$rxvt_cv_broken_ximcb = xyes; then 613 if test x$rxvt_cv_broken_ximcb = xyes; then
596 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.) 614 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
597 fi 615 fi
598 fi 616 fi
… …
605 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 623 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
606fi 624fi
607LIBS=$save_LIBS 625LIBS=$save_LIBS
608CFLAGS=$save_CFLAGS 626CFLAGS=$save_CFLAGS
609 627
610AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
611[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])
612if test x$rxvt_cv_func_setlocale = xyes; then
613 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
614fi
615
616AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo, 628AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,
617[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])]) 629[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])])
618if test x$rxvt_cv_func_nl_langinfo = xyes; then 630if test x$rxvt_cv_func_nl_langinfo = xyes; then
619 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) 631 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
620fi 632fi
… …
626TTY_GROUP_CHECK 638TTY_GROUP_CHECK
627 639
628dnl# -------------------------------------------------------------------------- 640dnl# --------------------------------------------------------------------------
629dnl# now add and remove other stuff 641dnl# now add and remove other stuff
630dnl# -------------------------------------------------------------------------- 642dnl# --------------------------------------------------------------------------
631if test x$support_xft = xyes; then 643if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then
644 rxvt_have_xrender=no
645 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
646 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
647 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS"
648 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
649 rxvt_have_xrender=yes
650
651 save_LIBS="$LIBS"
652 LIBS="$LIBS $X_LIBS"
653 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no])
654 AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no])
655 LIBS="$save_LIBS"
656 fi
657fi
658
659if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then
632 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 660 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
633 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 661 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
634 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 662 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
635 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 663 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
636 else 664 else
… …
639 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 667 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
640 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 668 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
641 fi 669 fi
642 fi 670 fi
643 671
672 if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then
673 X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS"
674 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
675 fi
676
644 save_LIBS="$LIBS" 677 save_LIBS="$LIBS"
645 LIBS="$LIBS $X_LIBS" 678 LIBS="$LIBS $X_LIBS"
646 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 679 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
647 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no]) 680 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
681 AC_CHECK_HEADERS(fontconfig/fontconfig.h,,[support_xft=no])
682 AC_CHECK_LIB(fontconfig,FcPatternGet,:,[support_xft=no])
648 LIBS="$save_LIBS" 683 LIBS="$save_LIBS"
649 684
650 if test x$support_xft = xyes; then 685 if test x$support_xft = xyes; then
651 AC_DEFINE(XFT, 1, Define to enable xft support) 686 AC_DEFINE(XFT, 1, Define to enable xft support)
652 fi 687 fi
653fi 688fi
689if test x$support_styles = xyes; then
690 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
691fi
692if test x$support_iso14755 = xyes; then
693 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
694fi
695if test x$support_8bitctrls = xyes; then
696 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
697fi
698if test x$support_fading = xyes; then
699 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
700fi
654if test x$support_inheritpixmap = xyes; then 701if test x$support_inheritpixmap = xyes; then
655 support_xrender=yes
656 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
657 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
658 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS"
659 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
660
661 save_LIBS="$LIBS"
662 LIBS="$LIBS $X_LIBS"
663 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[support_xrender=no])
664 AC_CHECK_FUNC(XRenderFindStandardFormat,,[support_xrender=no])
665 LIBS="$save_LIBS"
666 fi
667
668 if test x$support_xrender = xyes; then 702 if test x$rxvt_have_xrender = xyes; then
669 LIBS="$LIBS -lm" 703 LIBS="$LIBS -lm"
670 AC_DEFINE(XRENDER, 1, Define to enable xrender support) 704 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
671 fi 705 fi
672fi
673if test x$support_styles = xyes; then
674 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
675fi
676if test x$support_iso14755 = xyes; then
677 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
678fi
679if test x$support_8bitctrls = xyes; then
680 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
681fi
682if test x$support_fading = xyes; then
683 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
684fi
685if test x$support_inheritpixmap = xyes; then
686 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background) 706 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
687fi 707fi
688if test x$support_keepscrolling = xno; then 708if test x$support_keepscrolling = xno; then
689 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) 709 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
690fi 710fi

Diff Legend

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