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.107 by sf-exg, Sun Jan 31 09:47:24 2010 UTC vs.
Revision 1.137 by sf-exg, Thu Jan 19 11:08:19 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 ""
… …
32AC_AIX 32AC_AIX
33AC_GNU_SOURCE 33AC_GNU_SOURCE
34AC_ISC_POSIX 34AC_ISC_POSIX
35AC_LANG(C++) 35AC_LANG(C++)
36 36
37LINKER="$CXX"
37dnl check wether we can link with gcc -lsupc++ 38dnl check whether we can link with gcc -lsupc++
38if test x$GCC = xyes && test x$GXX = xyes; then 39if test x$GCC = xyes && test x$GXX = xyes; then
39 dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it 40 dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it
40 AC_MSG_CHECKING([for working libsupc++]) 41 AC_MSG_CHECKING([for working libsupc++])
41 save_CXX="$CXX" 42 save_CXX="$CXX"
42 save_LIBS="$LIBS" 43 save_LIBS="$LIBS"
43 CXX="$CC" 44 CXX="$CC"
44 LIBS="$LIBS -lsupc++" 45 LIBS="$LIBS -lsupc++"
45 LINKER="$CC"
46 AC_LINK_IFELSE( 46 AC_LINK_IFELSE(
47 [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])], 47 [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])],
48 [AC_MSG_RESULT(ok)], 48 [AC_MSG_RESULT(ok)
49 LINKER="$CC"],
49 [ 50 [
50 AC_MSG_RESULT([no, making everything bigger and slower]) 51 AC_MSG_RESULT([no, making everything bigger and slower])
51 LIBS="$save_LIBS" 52 LIBS="$save_LIBS"
52 LINKER="$save_CXX"
53 ] 53 ]
54 ) 54 )
55 CXX="$save_CXX" 55 CXX="$save_CXX"
56fi 56fi
57AC_SUBST(LINKER,[$LINKER]) 57AC_SUBST(LINKER,[$LINKER])
… …
67 CXXFLAGS="-O" 67 CXXFLAGS="-O"
68 fi 68 fi
69 CFLAGS="$CXXFLAGS" 69 CFLAGS="$CXXFLAGS"
70fi 70fi
71 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
78dnl# FreeBSD needs to link libxpg4 72dnl# FreeBSD needs to link libxpg4
79AC_CHECK_FUNC(setlocale, [], [AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])]) 73AC_SEARCH_LIBS(setlocale, xpg4)
80 74
81dnl# solaris needs to link libnsl and socket 75dnl# solaris needs to link libnsl and socket
82AC_CHECK_FUNC(gethostbyname, [], [AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])]) 76AC_SEARCH_LIBS(gethostbyname, nsl)
83AC_CHECK_FUNC(socket, [], [AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])]) 77AC_SEARCH_LIBS(socket, socket)
84 78
85support_frills=yes 79support_frills=yes
86support_inheritpixmap=yes 80support_inheritpixmap=yes
87support_fading=yes 81support_fading=yes
88support_keepscrolling=yes 82support_keepscrolling=yes
… …
93support_pointer_blank=yes 87support_pointer_blank=yes
94support_scroll_rxvt=yes 88support_scroll_rxvt=yes
95support_scroll_next=yes 89support_scroll_next=yes
96support_scroll_xterm=yes 90support_scroll_xterm=yes
97support_xim=yes 91support_xim=yes
98support_afterimage=yes 92support_pixbuf=yes
99support_afterstep=yes 93support_startup_notification=yes
100support_xft=yes 94support_xft=yes
101support_unicode3=no 95support_unicode3=no
102support_combining=yes 96support_combining=yes
103support_8bitctrls=no 97support_8bitctrls=no
104support_iso14755=yes 98support_iso14755=yes
… …
129 support_scroll_next=no 123 support_scroll_next=no
130 support_scroll_xterm=no 124 support_scroll_xterm=no
131 support_utmp=no 125 support_utmp=no
132 support_wtmp=no 126 support_wtmp=no
133 support_xim=no 127 support_xim=no
134 support_afterimage=no 128 support_pixbuf=no
135 support_afterstep=no 129 support_startup_notification=no
136 support_xft=no 130 support_xft=no
137 support_unicode3=no 131 support_unicode3=no
138 support_combining=no 132 support_combining=no
139 support_8bitctrls=no 133 support_8bitctrls=no
140 support_iso14755=no 134 support_iso14755=no
… …
157 support_scroll_next=yes 151 support_scroll_next=yes
158 support_scroll_xterm=yes 152 support_scroll_xterm=yes
159 support_utmp=yes 153 support_utmp=yes
160 support_wtmp=yes 154 support_wtmp=yes
161 support_xim=yes 155 support_xim=yes
162 support_afterimage=yes
163 support_afterstep=yes 156 support_pixbuf=yes
157 support_startup_notification=yes
164 support_xft=yes 158 support_xft=yes
165 support_unicode3=yes 159 support_unicode3=yes
166 support_combining=yes 160 support_combining=yes
167 #support_8bitctrls=yes 161 #support_8bitctrls=yes
168 support_iso14755=yes 162 support_iso14755=yes
… …
170 support_perl=yes 164 support_perl=yes
171 codesets=all 165 codesets=all
172 fi 166 fi
173 ]) 167 ])
174 168
175ASSERTIONS=no 169support_assertions=no
176AC_ARG_ENABLE(assert, 170AC_ARG_ENABLE(assert,
177 [ --enable-assert enable assertions], 171 [ --enable-assert enable assertions],
178 [if test x$enableval = xyes; then 172 [if test x$enableval = xyes; then
179 ASSERTIONS=yes 173 support_assertions=yes
180 fi]) 174 fi])
181if test x$ASSERTIONS = xno; then 175if test x$support_assertions = xno; then
182 AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging)) 176 AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging))
183fi 177fi
184 178
185WARNINGS=no 179support_warnings=no
186AC_ARG_ENABLE(warnings, 180AC_ARG_ENABLE(warnings,
187 [ --enable-warnings turn on g++ warnings], 181 [ --enable-warnings turn on g++ warnings],
188 [if test x$enableval = xyes; then 182 [if test x$enableval = xyes; then
189 WARNINGS=yes 183 support_warnings=yes
190 fi]) 184 fi])
191if test x$GXX = xyes; then 185if test x$GXX = xyes; then
192 if test $WARNINGS = yes; then 186 if test $support_warnings = yes; then
193 save_CXXFLAGS="$CXXFLAGS" 187 save_CXXFLAGS="$CXXFLAGS"
194 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor" 188 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-unused-value"
195 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"]) 189 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"])
196 else 190 else
197 CXXFLAGS="$CXXFLAGS -w" 191 CXXFLAGS="$CXXFLAGS -w"
198 fi 192 fi
199fi 193fi
200 194
195support_256_color=no
196AC_ARG_ENABLE(256-color,
197 [ --enable-256-color enable 256-color support],
198 [if test x$enableval = xyes; then
199 support_256_color=yes
200 fi])
201if test x$support_256_color = xyes; then
202 AC_DEFINE(USE_256_COLORS, 1, Define if you want 256-color support)
203fi
204
201AC_ARG_ENABLE(unicode3, 205AC_ARG_ENABLE(unicode3,
202 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters], 206 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters],
203 [if test x$enableval = xyes -o x$enableval = xno; then 207 [if test x$enableval = xyes -o x$enableval = xno; then
204 support_unicode3=$enableval 208 support_unicode3=$enableval
205 fi]) 209 fi])
… …
221 [if test x$enableval = xyes -o x$enableval = xno; then 225 [if test x$enableval = xyes -o x$enableval = xno; then
222 support_styles=$enableval 226 support_styles=$enableval
223 fi]) 227 fi])
224 228
225AC_ARG_ENABLE(afterimage, 229AC_ARG_ENABLE(afterimage,
226 [ --enable-afterimage enable integration with libAfterImage for background images], 230 [ --enable-afterimage enable integration with libAfterImage for background images (deprecated)],
227 [if test x$enableval = xyes -o x$enableval = xno; then 231 [if test x$enableval = xyes -o x$enableval = xno; then
228 support_afterimage=$enableval 232 support_afterimage=$enableval
229 fi]) 233 fi])
230 234
231AC_ARG_WITH(afterimage_config, 235AC_ARG_WITH(afterimage_config,
232 [ --with-afterimage-config=DIR use libAfterImage config script in DIR], 236 [ --with-afterimage-config=DIR use libAfterImage config script in DIR],
233 [if test "x$withval" != x; then 237 [if test "x$withval" != x; then
234 afterimage_config=$withval/afterimage-config 238 afterimage_config=$withval/afterimage-config
235 fi]) 239 fi])
236 240
237dnl AC_ARG_ENABLE(afterstep, 241AC_ARG_ENABLE(pixbuf,
238dnl [ --enable-afterstep enable integration with AfterStep window manager], 242 [ --enable-pixbuf enable integration with gdk-pixbuf for background images],
239dnl [if test x$enableval = xyes -o x$enableval = xno; then 243 [if test x$enableval = xyes -o x$enableval = xno; then
240dnl support_afterstep=$enableval 244 support_pixbuf=$enableval
241dnl fi]) 245 fi])
246
247AC_ARG_ENABLE(startup-notification,
248 [ --enable-startup-notification enable freedesktop startup notification support],
249 [if test x$enableval = xyes -o x$enableval = xno; then
250 support_startup_notification=$enableval
251 fi])
242 252
243AC_ARG_ENABLE(transparency, 253AC_ARG_ENABLE(transparency,
244 [ --enable-transparency enable transparent backgrounds], 254 [ --enable-transparency enable transparent backgrounds],
245 [if test x$enableval = xyes -o x$enableval = xno; then 255 [if test x$enableval = xyes -o x$enableval = xno; then
246 support_inheritpixmap=$enableval 256 support_inheritpixmap=$enableval
… …
339AC_ARG_WITH(name, 349AC_ARG_WITH(name,
340 [ --with-name=NAME set the basename for the installed binaries (default: urxvt)], 350 [ --with-name=NAME set the basename for the installed binaries (default: urxvt)],
341 [RXVTNAME="$withval"]) 351 [RXVTNAME="$withval"])
342AC_DEFINE_UNQUOTED(RXVTNAME,"$RXVTNAME", [Binary base name]) 352AC_DEFINE_UNQUOTED(RXVTNAME,"$RXVTNAME", [Binary base name])
343 353
344RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"`
345AC_SUBST(RXVTNAME) 354AC_SUBST(RXVTNAME)
346 355
347AC_ARG_ENABLE(swapscreen, 356AC_ARG_ENABLE(swapscreen,
348 [ --disable-swapscreen disable swap screen support], 357 [ --disable-swapscreen disable swap screen support],
349 [if test x$enableval = xno; then 358 [if test x$enableval = xno; then
… …
397 [if test x$enableval = xyes -o x$enableval = xno; then 406 [if test x$enableval = xyes -o x$enableval = xno; then
398 support_text_blink=$enableval 407 support_text_blink=$enableval
399 fi]) 408 fi])
400 409
401AC_ARG_ENABLE(pointer-blank, 410AC_ARG_ENABLE(pointer-blank,
402 [ --enable-pointer-blank enable pointer blank when typing or inactive pointer], 411 [ --enable-pointer-blank enable pointer blanking when typing or inactive],
403 [if test x$enableval = xyes -o x$enableval = xno; then 412 [if test x$enableval = xyes -o x$enableval = xno; then
404 support_pointer_blank=$enableval 413 support_pointer_blank=$enableval
405 fi]) 414 fi])
406 415
407AC_ARG_WITH(term, 416AC_ARG_WITH(term,
… …
425 434
426AC_PATH_PROG(TIC, tic, :) 435AC_PATH_PROG(TIC, tic, :)
427 436
428AC_PATH_XTRA 437AC_PATH_XTRA
429 438
439image_lib=none
440
441PIXBUF_CFLAGS=
442PIXBUF_LIBS=
443
444if test x$support_pixbuf = xyes; then
445 support_pixbuf=no
446 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
447 AC_MSG_CHECKING(for gdk-pixbuf)
448 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then
449 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
450 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
451 support_pixbuf=yes
452 fi
453
454 if test x$support_pixbuf = xyes; then
455 AC_MSG_RESULT(ok)
456 image_lib=gdk-pixbuf
457 support_afterimage=no
458 AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing)
459 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
460 else
461 AC_MSG_RESULT(no)
462 fi
463fi
464
465AC_SUBST(PIXBUF_CFLAGS)
466AC_SUBST(PIXBUF_LIBS)
467
468STARTUP_NOTIFICATION_CFLAGS=
469STARTUP_NOTIFICATION_LIBS=
470
471if test x$support_startup_notification = xyes; then
472 support_startup_notification=no
473 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
474 AC_MSG_CHECKING(for libstartup-notification)
475 if test $PKG_CONFIG != no && $PKG_CONFIG --exists libstartup-notification-1.0; then
476 STARTUP_NOTIFICATION_CFLAGS="`$PKG_CONFIG libstartup-notification-1.0 --cflags`"
477 STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG libstartup-notification-1.0 --libs`"
478 support_startup_notification=yes
479 fi
480
481 if test x$support_startup_notification = xyes; then
482 AC_MSG_RESULT(ok)
483 AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, Define if freedesktop startup notifications should be supported)
484 else
485 AC_MSG_RESULT(no)
486 fi
487fi
488
489AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
490AC_SUBST(STARTUP_NOTIFICATION_LIBS)
491
430AFTERIMAGE_CFLAGS= 492AFTERIMAGE_CFLAGS=
431AFTERIMAGE_LIBS= 493AFTERIMAGE_LIBS=
432AFTERIMAGE_VERSION=
433 494
434if test x$support_afterimage = xyes; then 495if test x$support_afterimage = xyes; then
435 support_afterimage=no 496 support_afterimage=no
436 497
437 if test "x$afterimage_config" = "x" ; then 498 if test "x$afterimage_config" = "x" ; then
438 AC_PATH_PROG(afterimage_config, afterimage-config, no) 499 AC_PATH_PROG(afterimage_config, afterimage-config, no)
439 fi 500 fi
440 if test "x$afterimage_config" != "xno" ; then 501 if test "x$afterimage_config" != "xno" ; then
441 AC_MSG_CHECKING(for libAfterImage version >= 1.15) 502 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
442 xAFTERIMAGE_VERSION=`$afterimage_config --version` 503 AFTERIMAGE_VERSION=`$afterimage_config --version`
443 if test -n "$xAFTERIMAGE_VERSION" ; then 504 if test -n "$AFTERIMAGE_VERSION" ; then
444 xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 505 AFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
445 xAFTERIMAGE_LIBS=`$afterimage_config --libs` 506 AFTERIMAGE_LIBS=`$afterimage_config --libs`
446 if test "x$xAFTERIMAGE_LIBS" != "x"; then 507 if test "x$AFTERIMAGE_LIBS" != "x"; then
447 libai_ver_major=`echo $xAFTERIMAGE_VERSION | cut -f 1 -d .` 508 libai_ver_major=`echo $AFTERIMAGE_VERSION | cut -f 1 -d .`
448 libai_ver_minor=`echo $xAFTERIMAGE_VERSION | cut -f 2 -d .` 509 libai_ver_minor=`echo $AFTERIMAGE_VERSION | cut -f 2 -d .`
449 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then 510 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then
450 support_afterimage=yes 511 support_afterimage=yes
451 AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS"
452 AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS"
453 AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION"
454 fi 512 fi
455 fi 513 fi
456 fi 514 fi
457 if test "x$support_afterimage" = "xyes"; then 515 if test "x$support_afterimage" = "xyes"; then
458 AC_MSG_RESULT($AFTERIMAGE_LIBS) 516 AC_MSG_RESULT($AFTERIMAGE_LIBS)
517 image_lib=libafterimage
518 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
519 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
459 else 520 else
460 AC_MSG_RESULT(no) 521 AC_MSG_RESULT(no)
522 AFTERIMAGE_CFLAGS=
523 AFTERIMAGE_LIBS=
461 fi 524 fi
462 fi 525 fi
463fi 526fi
527
528AC_SUBST(AFTERIMAGE_CFLAGS)
529AC_SUBST(AFTERIMAGE_LIBS)
464 530
465dnl# -------------------------------------------------------------------------- 531dnl# --------------------------------------------------------------------------
466dnl# CHECKING FOR HEADER FILES 532dnl# CHECKING FOR HEADER FILES
467dnl# -------------------------------------------------------------------------- 533dnl# --------------------------------------------------------------------------
468AC_CHECK_HEADERS( \ 534AC_CHECK_HEADERS( \
… …
472 sys/strredir.h \ 538 sys/strredir.h \
473 stdint.h \ 539 stdint.h \
474 wchar.h \ 540 wchar.h \
475 cwchar \ 541 cwchar \
476) 542)
477
478AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
479[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
480if test x$rxvt_cv_xpointer = xyes; then
481 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
482fi
483 543
484AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access, 544AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
485[AC_COMPILE_IFELSE( 545[AC_COMPILE_IFELSE(
486 [AC_LANG_PROGRAM([ 546 [AC_LANG_PROGRAM([
487#define XLIB_ILLEGAL_ACCESS 547#define XLIB_ILLEGAL_ACCESS
… …
525save_CFLAGS=$CFLAGS 585save_CFLAGS=$CFLAGS
526CFLAGS="$CFLAGS $X_CFLAGS" 586CFLAGS="$CFLAGS $X_CFLAGS"
527LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 587LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
528if test x$support_xim = xyes; then 588if test x$support_xim = xyes; then
529 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 589 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
530 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 590 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
591 #include <X11/Xlib.h>
531 #include <stdlib.h> 592 #include <stdlib.h>
532 main() { 593 int main() {
533 char *p; 594 char *p;
534 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 595 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
535 exit (XSupportsLocale() ? 0 : 1); 596 exit (XSupportsLocale() ? 0 : 1);
536 else 597 else
537 exit (1);}]])],[dnl 598 exit (1);
599 }
538 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 600 ]])],[rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[:])])
539 :])])
540 if test x$rxvt_cv_func_xlocale = xyes; then 601 if test x$rxvt_cv_func_xlocale = xyes; then
541 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input) 602 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
542 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb, 603 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
543 [AC_COMPILE_IFELSE([ 604 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
544 #include <X11/Xlib.h> 605 #include <X11/Xlib.h>
545 606
546 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); 607 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
547 608
548 void f() { 609 void f() {
549 XIMCallback cb; 610 XIMCallback cb;
550 cb.callback = im_destroy_cb; 611 cb.callback = im_destroy_cb;
551 } 612 }
552 ],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)]) 613 ]])],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
553 614
554 if test x$rxvt_cv_broken_ximcb = xyes; then 615 if test x$rxvt_cv_broken_ximcb = xyes; then
555 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.) 616 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
556 fi 617 fi
557 fi 618 fi
… …
585TTY_GROUP_CHECK 646TTY_GROUP_CHECK
586 647
587dnl# -------------------------------------------------------------------------- 648dnl# --------------------------------------------------------------------------
588dnl# now add and remove other stuff 649dnl# now add and remove other stuff
589dnl# -------------------------------------------------------------------------- 650dnl# --------------------------------------------------------------------------
590if test x$support_xft = xyes; then 651if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then
652 rxvt_have_xrender=no
653 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
654 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
655 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS"
656 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
657 rxvt_have_xrender=yes
658
659 save_LIBS="$LIBS"
660 LIBS="$LIBS $X_LIBS"
661 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no])
662 AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no])
663 LIBS="$save_LIBS"
664 fi
665fi
666
667if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then
591 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 668 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
592 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 669 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
593 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 670 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
594 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 671 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
595 else 672 else
… …
598 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 675 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
599 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 676 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
600 fi 677 fi
601 fi 678 fi
602 679
680 if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then
681 X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS"
682 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
683 fi
684
603 save_LIBS="$LIBS" 685 save_LIBS="$LIBS"
604 LIBS="$LIBS $X_LIBS" 686 LIBS="$LIBS $X_LIBS"
605 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 687 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
606 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no]) 688 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
689 AC_CHECK_HEADERS(fontconfig/fontconfig.h,,[support_xft=no])
690 AC_CHECK_LIB(fontconfig,FcPatternGet,:,[support_xft=no])
607 LIBS="$save_LIBS" 691 LIBS="$save_LIBS"
608 692
609 if test x$support_xft = xyes; then 693 if test x$support_xft = xyes; then
610 AC_DEFINE(XFT, 1, Define to enable xft support) 694 AC_DEFINE(XFT, 1, Define to enable xft support)
611 fi 695 fi
… …
621fi 705fi
622if test x$support_fading = xyes; then 706if test x$support_fading = xyes; then
623 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) 707 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
624fi 708fi
625if test x$support_inheritpixmap = xyes; then 709if test x$support_inheritpixmap = xyes; then
710 if test x$rxvt_have_xrender = xyes; then
711 LIBS="$LIBS -lm"
712 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
713 fi
626 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background) 714 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
627fi 715fi
628if test x$support_keepscrolling = xno; then 716if test x$support_keepscrolling = xno; then
629 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) 717 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
630fi 718fi
… …
638 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) 726 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
639fi 727fi
640if test x$support_mouseslipwheel = xyes; then 728if test x$support_mouseslipwheel = xyes; then
641 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling) 729 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
642fi 730fi
643if test x$support_afterimage = xyes; then
644 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
645 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps. Needs libAfterImage)
646fi
647
648dnl if test x$support_afterstep = xyes; then
649dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)
650dnl fi
651 731
652scrolltypes=plain 732scrolltypes=plain
653AC_DEFINE(PLAIN_SCROLLBAR, 1, Support plain style scrollbars) 733AC_DEFINE(PLAIN_SCROLLBAR, 1, Support plain style scrollbars)
654 734
655if test x$support_scroll_rxvt = xyes; then 735if test x$support_scroll_rxvt = xyes; then
… …
663if test x$support_scroll_xterm = xyes; then 743if test x$support_scroll_xterm = xyes; then
664 AC_DEFINE(XTERM_SCROLLBAR, 1, Support Xterm style scrollbars) 744 AC_DEFINE(XTERM_SCROLLBAR, 1, Support Xterm style scrollbars)
665 scrolltypes="$scrolltypes xterm" 745 scrolltypes="$scrolltypes xterm"
666fi 746fi
667if test x$support_pointer_blank = xyes; then 747if test x$support_pointer_blank = xyes; then
668 AC_DEFINE(POINTER_BLANK, 1, Define if you want hide the pointer while typing) 748 AC_DEFINE(POINTER_BLANK, 1, Define if you want to hide the pointer while typing)
669fi 749fi
670if test x$support_text_blink = xyes; then 750if test x$support_text_blink = xyes; then
671 AC_DEFINE(TEXT_BLINK, 1, Define if you want blinking text support) 751 AC_DEFINE(TEXT_BLINK, 1, Define if you want blinking text support)
672fi 752fi
673if test x$support_unicode3 = xyes; then 753if test x$support_unicode3 = xyes; then
… …
733AC_SUBST(PERLPRIVLIBEXP) 813AC_SUBST(PERLPRIVLIBEXP)
734AC_SUBST(PERL) 814AC_SUBST(PERL)
735AC_SUBST(IF_PERL) 815AC_SUBST(IF_PERL)
736AC_SUBST(PERL_O) 816AC_SUBST(PERL_O)
737 817
738AC_SUBST(CFLAGS)
739AC_SUBST(CPPFLAGS)
740AC_SUBST(LDFLAGS)
741AC_SUBST(X_CFLAGS)
742
743dnl# Attack the libs
744AC_SUBST(LIBS)
745AC_SUBST(X_LIBS)
746AC_SUBST(X_EXTRA_LIBS)
747
748AC_SUBST(AFTERIMAGE_CFLAGS)
749AC_SUBST(AFTERIMAGE_LIBS)
750
751AC_ARG_PROGRAM
752 818
753AC_CONFIG_FILES([Makefile \ 819AC_CONFIG_FILES([Makefile \
754doc/Makefile \ 820doc/Makefile \
755src/Makefile \ 821src/Makefile \
756]) 822])
… …
776if test x$RESFALLBACK != x; then 842if test x$RESFALLBACK != x; then
777 echo " resource class fallback: $RESFALLBACK" 843 echo " resource class fallback: $RESFALLBACK"
778fi 844fi
779echo 845echo
780echo " embedded perl: $support_perl" 846echo " embedded perl: $support_perl"
781echo " libafterimage: $support_afterimage" 847echo " image library: $image_lib"
782dnl echo " AfterStep integration: $support_afterstep"
783echo 848echo
784if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then 849if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then
785 echo ".----------------------------------------------------------------." 850 echo ".----------------------------------------------------------------."
786 echo ". WARNING: --enable-xim was specified however the locale support ." 851 echo ". WARNING: --enable-xim was specified however the locale support ."
787 echo ". functions could not be found. ." 852 echo ". functions could not be found. ."

Diff Legend

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