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.124 by sf-exg, Mon Jan 3 10:32:08 2011 UTC vs.
Revision 1.144 by root, Tue Jun 19 18:17:56 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
104support_styles=yes 98support_styles=yes
105support_perl=yes 99support_perl=yes
100support_xdbe=yes
106codesets=all 101codesets=all
107 102
108dnl# -------------------------------------------------------------------------- 103dnl# --------------------------------------------------------------------------
109dnl# CHECKING COMMAND LINE OPTIONS 104dnl# CHECKING COMMAND LINE OPTIONS
110dnl# -------------------------------------------------------------------------- 105dnl# --------------------------------------------------------------------------
… …
113 [ --enable-everything enable standard non-multichoice features 108 [ --enable-everything enable standard non-multichoice features
114 NOTE: this option is order dependent], 109 NOTE: this option is order dependent],
115 [ 110 [
116 if test x$enableval = xno; then 111 if test x$enableval = xno; then
117 support_frills=no 112 support_frills=no
113 support_xdbe=no
118 support_inheritpixmap=no 114 support_inheritpixmap=no
119 support_fading=no 115 support_fading=no
120 support_keepscrolling=no 116 support_keepscrolling=no
121 support_selectionscrolling=no 117 support_selectionscrolling=no
122 support_lastlog=no 118 support_lastlog=no
… …
128 support_scroll_next=no 124 support_scroll_next=no
129 support_scroll_xterm=no 125 support_scroll_xterm=no
130 support_utmp=no 126 support_utmp=no
131 support_wtmp=no 127 support_wtmp=no
132 support_xim=no 128 support_xim=no
133 support_afterimage=no 129 support_pixbuf=no
130 support_startup_notification=no
134 support_xft=no 131 support_xft=no
135 support_unicode3=no 132 support_unicode3=no
136 support_combining=no 133 support_combining=no
137 support_8bitctrls=no 134 support_8bitctrls=no
138 support_iso14755=no 135 support_iso14755=no
139 support_styles=no 136 support_styles=no
140 support_perl=no 137 support_perl=no
138 support_xdbe=no
141 codesets= 139 codesets=
142 fi 140 fi
143 if test x$enableval = xyes; then 141 if test x$enableval = xyes; then
144 support_frills=yes 142 support_frills=yes
145 support_inheritpixmap=yes 143 support_inheritpixmap=yes
… …
155 support_scroll_next=yes 153 support_scroll_next=yes
156 support_scroll_xterm=yes 154 support_scroll_xterm=yes
157 support_utmp=yes 155 support_utmp=yes
158 support_wtmp=yes 156 support_wtmp=yes
159 support_xim=yes 157 support_xim=yes
160 support_afterimage=yes 158 support_pixbuf=yes
159 support_startup_notification=yes
161 support_xft=yes 160 support_xft=yes
162 support_unicode3=yes 161 support_unicode3=yes
163 support_combining=yes 162 support_combining=yes
164 #support_8bitctrls=yes 163 #support_8bitctrls=yes
165 support_iso14755=yes 164 support_iso14755=yes
166 support_styles=yes 165 support_styles=yes
167 support_perl=yes 166 support_perl=yes
167 support_xdbe=yes
168 codesets=all 168 codesets=all
169 fi 169 fi
170 ]) 170 ])
171 171
172ASSERTIONS=no 172support_assertions=no
173AC_ARG_ENABLE(assert, 173AC_ARG_ENABLE(assert,
174 [ --enable-assert enable assertions], 174 [ --enable-assert enable assertions],
175 [if test x$enableval = xyes; then 175 [if test x$enableval = xyes; then
176 ASSERTIONS=yes 176 support_assertions=yes
177 fi]) 177 fi])
178if test x$ASSERTIONS = xno; then 178if test x$support_assertions = xno; then
179 AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging)) 179 AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging))
180fi 180fi
181 181
182WARNINGS=no 182support_warnings=no
183AC_ARG_ENABLE(warnings, 183AC_ARG_ENABLE(warnings,
184 [ --enable-warnings turn on g++ warnings], 184 [ --enable-warnings turn on g++ warnings],
185 [if test x$enableval = xyes; then 185 [if test x$enableval = xyes; then
186 WARNINGS=yes 186 support_warnings=yes
187 fi]) 187 fi])
188if test x$GXX = xyes; then 188if test x$GXX = xyes; then
189 if test $WARNINGS = yes; then 189 if test $support_warnings = yes; then
190 save_CXXFLAGS="$CXXFLAGS" 190 save_CXXFLAGS="$CXXFLAGS"
191 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor" 191 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-unused-value"
192 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"]) 192 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"])
193 else 193 else
194 CXXFLAGS="$CXXFLAGS -w" 194 CXXFLAGS="$CXXFLAGS -w"
195 fi 195 fi
196fi 196fi
… …
227 [ --enable-font-styles enable bold and italic support], 227 [ --enable-font-styles enable bold and italic support],
228 [if test x$enableval = xyes -o x$enableval = xno; then 228 [if test x$enableval = xyes -o x$enableval = xno; then
229 support_styles=$enableval 229 support_styles=$enableval
230 fi]) 230 fi])
231 231
232AC_ARG_ENABLE(afterimage,
233 [ --enable-afterimage enable integration with libAfterImage for background images],
234 [if test x$enableval = xyes -o x$enableval = xno; then
235 support_afterimage=$enableval
236 fi])
237
238AC_ARG_WITH(afterimage_config,
239 [ --with-afterimage-config=DIR use libAfterImage config script in DIR],
240 [if test "x$withval" != x; then
241 afterimage_config=$withval/afterimage-config
242 fi])
243
244AC_ARG_ENABLE(pixbuf, 232AC_ARG_ENABLE(pixbuf,
245 [ --enable-pixbuf enable integration with gdk-pixbuf for background images], 233 [ --enable-pixbuf enable integration with gdk-pixbuf for background images],
246 [if test x$enableval = xyes -o x$enableval = xno; then 234 [if test x$enableval = xyes -o x$enableval = xno; then
247 support_pixbuf=$enableval 235 support_pixbuf=$enableval
236 fi])
237
238AC_ARG_ENABLE(startup-notification,
239 [ --enable-startup-notification enable freedesktop startup notification support],
240 [if test x$enableval = xyes -o x$enableval = xno; then
241 support_startup_notification=$enableval
248 fi]) 242 fi])
249 243
250AC_ARG_ENABLE(transparency, 244AC_ARG_ENABLE(transparency,
251 [ --enable-transparency enable transparent backgrounds], 245 [ --enable-transparency enable transparent backgrounds],
252 [if test x$enableval = xyes -o x$enableval = xno; then 246 [if test x$enableval = xyes -o x$enableval = xno; then
… …
420 [ --with-terminfo=PATH set the path to the terminfo tree to PATH], 414 [ --with-terminfo=PATH set the path to the terminfo tree to PATH],
421 [if test x$withval != x; then 415 [if test x$withval != x; then
422 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" 416 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
423 fi]) 417 fi])
424 418
419AC_ARG_ENABLE(xdbe,
420 [ --enable-xdbe enable support for double buffering],
421 [if test x$enableval = xyes -o x$enableval = xno; then
422 support_xdbe=$enableval
423 fi])
424
425dnl# -------------------------------------------------------------------------- 425dnl# --------------------------------------------------------------------------
426 426
427LIBEV_M4_AVOID_LIBRT=1 427LIBEV_M4_AVOID_LIBRT=1
428m4_include([libev/libev.m4]) 428m4_include([libev/libev.m4])
429 429
… …
431 431
432AC_PATH_PROG(TIC, tic, :) 432AC_PATH_PROG(TIC, tic, :)
433 433
434AC_PATH_XTRA 434AC_PATH_XTRA
435 435
436image_lib=none 436STARTUP_NOTIFICATION_CFLAGS=
437STARTUP_NOTIFICATION_LIBS=
437 438
438PIXBUF_CFLAGS=
439PIXBUF_LIBS=
440
441if test x$support_pixbuf = xyes; then 439if test x$support_startup_notification = xyes; then
442 support_pixbuf=no 440 support_startup_notification=no
443 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 441 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
444 AC_MSG_CHECKING(for gdk-pixbuf) 442 AC_MSG_CHECKING(for libstartup-notification)
445 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then 443 if test $PKG_CONFIG != no && $PKG_CONFIG --exists libstartup-notification-1.0; then
446 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`" 444 STARTUP_NOTIFICATION_CFLAGS="`$PKG_CONFIG libstartup-notification-1.0 --cflags`"
447 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`" 445 STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG libstartup-notification-1.0 --libs`"
448 support_pixbuf=yes 446 support_startup_notification=yes
449 fi 447 fi
450 448
451 if test x$support_pixbuf = xyes; then 449 if test x$support_startup_notification = xyes; then
452 AC_MSG_RESULT(ok) 450 AC_MSG_RESULT(ok)
453 image_lib=gdk-pixbuf 451 AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, Define if freedesktop startup notifications should be supported)
454 support_afterimage=no
455 AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing)
456 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
457 else 452 else
458 AC_MSG_RESULT(no) 453 AC_MSG_RESULT(no)
459 fi 454 fi
460fi 455fi
461 456
462AC_SUBST(PIXBUF_CFLAGS) 457AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
463AC_SUBST(PIXBUF_LIBS) 458AC_SUBST(STARTUP_NOTIFICATION_LIBS)
464
465AFTERIMAGE_CFLAGS=
466AFTERIMAGE_LIBS=
467AFTERIMAGE_VERSION=
468
469if test x$support_afterimage = xyes; then
470 support_afterimage=no
471
472 if test "x$afterimage_config" = "x" ; then
473 AC_PATH_PROG(afterimage_config, afterimage-config, no)
474 fi
475 if test "x$afterimage_config" != "xno" ; then
476 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
477 xAFTERIMAGE_VERSION=`$afterimage_config --version`
478 if test -n "$xAFTERIMAGE_VERSION" ; then
479 xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
480 xAFTERIMAGE_LIBS=`$afterimage_config --libs`
481 if test "x$xAFTERIMAGE_LIBS" != "x"; then
482 libai_ver_major=`echo $xAFTERIMAGE_VERSION | cut -f 1 -d .`
483 libai_ver_minor=`echo $xAFTERIMAGE_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
485 support_afterimage=yes
486 AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS"
487 AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS"
488 AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION"
489 fi
490 fi
491 fi
492 if test "x$support_afterimage" = "xyes"; then
493 AC_MSG_RESULT($AFTERIMAGE_LIBS)
494 image_lib=libafterimage
495 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.)
497 else
498 AC_MSG_RESULT(no)
499 fi
500 fi
501fi
502
503AC_SUBST(AFTERIMAGE_CFLAGS)
504AC_SUBST(AFTERIMAGE_LIBS)
505 459
506dnl# -------------------------------------------------------------------------- 460dnl# --------------------------------------------------------------------------
507dnl# CHECKING FOR HEADER FILES 461dnl# CHECKING FOR HEADER FILES
508dnl# -------------------------------------------------------------------------- 462dnl# --------------------------------------------------------------------------
509AC_CHECK_HEADERS( \ 463AC_CHECK_HEADERS( \
… …
511 sys/ioctl.h \ 465 sys/ioctl.h \
512 sys/sockio.h \ 466 sys/sockio.h \
513 sys/strredir.h \ 467 sys/strredir.h \
514 stdint.h \ 468 stdint.h \
515 wchar.h \ 469 wchar.h \
516 cwchar \
517) 470)
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 471
525AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access, 472AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
526[AC_COMPILE_IFELSE( 473[AC_COMPILE_IFELSE(
527 [AC_LANG_PROGRAM([ 474 [AC_LANG_PROGRAM([
528#define XLIB_ILLEGAL_ACCESS 475#define XLIB_ILLEGAL_ACCESS
… …
566save_CFLAGS=$CFLAGS 513save_CFLAGS=$CFLAGS
567CFLAGS="$CFLAGS $X_CFLAGS" 514CFLAGS="$CFLAGS $X_CFLAGS"
568LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 515LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
569if test x$support_xim = xyes; then 516if test x$support_xim = xyes; then
570 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 517 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
571 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 518 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
519 #include <X11/Xlib.h>
572 #include <stdlib.h> 520 #include <stdlib.h>
573 main() { 521 int main() {
574 char *p; 522 char *p;
575 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 523 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
576 exit (XSupportsLocale() ? 0 : 1); 524 exit (XSupportsLocale() ? 0 : 1);
577 else 525 else
578 exit (1);}]])],[dnl 526 exit (1);
527 }
579 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 528 ]])],[rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[:])])
580 :])])
581 if test x$rxvt_cv_func_xlocale = xyes; then 529 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) 530 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, 531 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
584 [AC_COMPILE_IFELSE([ 532 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
585 #include <X11/Xlib.h> 533 #include <X11/Xlib.h>
586 534
587 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); 535 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
588 536
589 void f() { 537 void f() {
590 XIMCallback cb; 538 XIMCallback cb;
591 cb.callback = im_destroy_cb; 539 cb.callback = im_destroy_cb;
592 } 540 }
593 ],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)]) 541 ]])],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
594 542
595 if test x$rxvt_cv_broken_ximcb = xyes; then 543 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.) 544 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
597 fi 545 fi
598 fi 546 fi
… …
605 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 553 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
606fi 554fi
607LIBS=$save_LIBS 555LIBS=$save_LIBS
608CFLAGS=$save_CFLAGS 556CFLAGS=$save_CFLAGS
609 557
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, 558AC_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])]) 559[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 560if test x$rxvt_cv_func_nl_langinfo = xyes; then
619 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) 561 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
620fi 562fi
… …
626TTY_GROUP_CHECK 568TTY_GROUP_CHECK
627 569
628dnl# -------------------------------------------------------------------------- 570dnl# --------------------------------------------------------------------------
629dnl# now add and remove other stuff 571dnl# now add and remove other stuff
630dnl# -------------------------------------------------------------------------- 572dnl# --------------------------------------------------------------------------
573support_image=no
574if test x$support_inheritpixmap = xyes || test x$support_pixbuf = xyes; then
575 support_image=yes
576fi
577if test x$support_xdbe = xyes; then
578 LIBS="$LIBS -lXext"
579fi
580
631if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then 581if test x$support_xft = xyes || test x$support_image = xyes; then
632 rxvt_have_xrender=no 582 rxvt_have_xrender=no
633 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 583 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
634 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then 584 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
635 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS" 585 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS"
636 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`" 586 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
… …
672 622
673 if test x$support_xft = xyes; then 623 if test x$support_xft = xyes; then
674 AC_DEFINE(XFT, 1, Define to enable xft support) 624 AC_DEFINE(XFT, 1, Define to enable xft support)
675 fi 625 fi
676fi 626fi
627
628image_lib=none
629
630PIXBUF_CFLAGS=
631PIXBUF_LIBS=
632
633if test x$support_image = xyes && test x$rxvt_have_xrender = xyes; then
634 LIBS="$LIBS -lm"
635 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
636
637 if test x$support_inheritpixmap = xyes; then
638 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
639 fi
640
641 if test x$support_pixbuf = xyes; then
642 support_pixbuf=no
643 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
644 AC_MSG_CHECKING(for gdk-pixbuf)
645 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then
646 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
647 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
648 support_pixbuf=yes
649 fi
650
651 if test x$support_pixbuf = xyes; then
652 AC_MSG_RESULT(ok)
653 image_lib=gdk-pixbuf
654 AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing)
655 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
656 else
657 AC_MSG_RESULT(no)
658 fi
659 fi
660fi
661
662AC_SUBST(PIXBUF_CFLAGS)
663AC_SUBST(PIXBUF_LIBS)
664
665if test x$support_xdbe = xyes; then
666 AC_DEFINE(ENABLE_XDBE, 1, Define if you want to use XDBE)
667fi
677if test x$support_styles = xyes; then 668if test x$support_styles = xyes; then
678 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support) 669 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
679fi 670fi
680if test x$support_iso14755 = xyes; then 671if test x$support_iso14755 = xyes; then
681 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support) 672 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
… …
683if test x$support_8bitctrls = xyes; then 674if test x$support_8bitctrls = xyes; then
684 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences) 675 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
685fi 676fi
686if test x$support_fading = xyes; then 677if test x$support_fading = xyes; then
687 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) 678 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
688fi
689if test x$support_inheritpixmap = xyes; then
690 if test x$rxvt_have_xrender = xyes; then
691 LIBS="$LIBS -lm"
692 AC_DEFINE(XRENDER, 1, Define to enable xrender support)
693 fi
694 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
695fi 679fi
696if test x$support_keepscrolling = xno; then 680if test x$support_keepscrolling = xno; then
697 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) 681 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
698fi 682fi
699if test x$support_selectionscrolling = xyes; then 683if test x$support_selectionscrolling = xyes; then
… …
751 esac 735 esac
752done 736done
753 737
754IF_PERL=\# 738IF_PERL=\#
755if test x$support_perl = xyes; then 739if test x$support_perl = xyes; then
756 AC_PATH_PROG(PERL, perl5) 740 AC_PATH_PROG(PERL, perl5, perl)
757 AC_PATH_PROG(PERL, perl)
758 741
759 AC_MSG_CHECKING(for $PERL suitability) 742 AC_MSG_CHECKING(for $PERL suitability)
760 if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then 743 if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then
761 744
762 save_CXXFLAGS="$CXXFLAGS" 745 save_CXXFLAGS="$CXXFLAGS"

Diff Legend

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