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.68 by ayin, Wed Aug 1 18:10:10 2007 UTC vs.
Revision 1.89 by ayin, Mon Dec 10 23:36:05 2007 UTC

15DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 15DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
16dnl LIBVERSION=`sed -n -e 's/^.*[ \t]LIBVERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 16dnl LIBVERSION=`sed -n -e 's/^.*[ \t]LIBVERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
17changequote([, ])dnl 17changequote([, ])dnl
18AC_SUBST(VERSION)dnl 18AC_SUBST(VERSION)dnl
19AC_SUBST(DATE)dnl 19AC_SUBST(DATE)dnl
20AC_SUBST(LSMDATE)dnl
21AC_SUBST(LIBVERSION)dnl 20dnl AC_SUBST(LIBVERSION)dnl
21
22echo "" 22echo ""
23echo "configuring for rxvt $VERSION" 23echo "configuring for rxvt $VERSION"
24echo "" 24echo ""
25 25
26orig_CXXFLAGS="$CXXFLAGS" 26orig_CXXFLAGS="$CXXFLAGS"
27 27
28dnl# Checks for programs. 28dnl# Checks for programs.
29dnl AC_MAKE_SET
30
31AC_PROG_CC 29AC_PROG_CC
32AC_PROG_CXX 30AC_PROG_CXX
33AC_PROG_CPP 31AC_PROG_CPP
34AC_PROG_INSTALL 32AC_PROG_INSTALL
35 33
62dnl# -------------------------------------------------------------------------- 60dnl# --------------------------------------------------------------------------
63dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' 61dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
64dnl# 62dnl#
65if test -z "$orig_CXXFLAGS"; then 63if test -z "$orig_CXXFLAGS"; then
66 if test x$GCC = xyes && test "x$GXX" = xyes; then 64 if test x$GCC = xyes && test "x$GXX" = xyes; then
67 CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs" 65 CXXFLAGS="-g -O3 -fno-rtti -fvisibility-inlines-hidden -fno-threadsafe-statics -fno-enforce-eh-specs"
68 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"]) 66 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"])
69 else 67 else
70 CXXFLAGS="-O" 68 CXXFLAGS="-O"
71 fi 69 fi
72 CFLAGS="$CXXFLAGS" 70 CFLAGS="$CXXFLAGS"
95dnl AC_ENABLE_STATIC(yes)dnl# libtool 93dnl AC_ENABLE_STATIC(yes)dnl# libtool
96dnl AC_PROG_LIBTOOL()dnl# libtool 94dnl AC_PROG_LIBTOOL()dnl# libtool
97 95
98support_frills=yes 96support_frills=yes
99support_inheritpixmap=yes 97support_inheritpixmap=yes
100support_tinting=yes
101support_fading=yes 98support_fading=yes
102support_keepscrolling=yes 99support_keepscrolling=yes
103support_selectionscrolling=yes 100support_selectionscrolling=yes
104support_mousewheel=yes 101support_mousewheel=yes
105support_mouseslipwheel=yes 102support_mouseslipwheel=yes
108support_scroll_rxvt=yes 105support_scroll_rxvt=yes
109support_scroll_next=yes 106support_scroll_next=yes
110support_scroll_xterm=yes 107support_scroll_xterm=yes
111support_scroll_plain=yes 108support_scroll_plain=yes
112support_xim=yes 109support_xim=yes
113support_xpm=yes
114support_afterimage=yes 110support_afterimage=yes
115support_afterstep=yes 111support_afterstep=yes
116support_xft=yes 112support_xft=yes
117support_unicode3=no 113support_unicode3=no
118support_combining=yes 114support_combining=yes
124 120
125dnl# -------------------------------------------------------------------------- 121dnl# --------------------------------------------------------------------------
126dnl# CHECKING COMMAND LINE OPTIONS 122dnl# CHECKING COMMAND LINE OPTIONS
127dnl# -------------------------------------------------------------------------- 123dnl# --------------------------------------------------------------------------
128 124
129if test "x$enable_shared" = xyes; then 125dnl if test "x$enable_shared" = xyes; then
130 AC_DEFINE(LIBRXVT, 1, Build shared library version - specify via configure only) 126dnl AC_DEFINE(LIBRXVT, 1, Build shared library version - specify via configure only)
131 INSTALL_LIBRXVT=yes 127dnl INSTALL_LIBRXVT=yes
132fi 128dnl fi
133AC_SUBST(INSTALL_LIBRXVT) 129dnl AC_SUBST(INSTALL_LIBRXVT)
134 130
135AC_ARG_ENABLE(everything, 131AC_ARG_ENABLE(everything,
136 [ --enable-everything enable standard non-multichoice features 132 [ --enable-everything enable standard non-multichoice features
137 NOTE: this option is order dependent 133 NOTE: this option is order dependent],
138 NOTE: automatically enabled with --enable-shared],
139 [ 134 [
140 if test x$enableval = xno; then 135 if test x$enableval = xno; then
141 support_frills=no 136 support_frills=no
142 support_inheritpixmap=no 137 support_inheritpixmap=no
143 support_tinting=no
144 support_fading=no 138 support_fading=no
145 support_keepscrolling=no 139 support_keepscrolling=no
146 support_selectionscrolling=no 140 support_selectionscrolling=no
147 support_lastlog=no 141 support_lastlog=no
148 support_mousewheel=no 142 support_mousewheel=no
154 support_scroll_xterm=no 148 support_scroll_xterm=no
155 support_scroll_plain=no 149 support_scroll_plain=no
156 support_utmp=no 150 support_utmp=no
157 support_wtmp=no 151 support_wtmp=no
158 support_xim=no 152 support_xim=no
159 support_xpm=no
160 support_afterimage=no 153 support_afterimage=no
161 support_afterstep=no 154 support_afterstep=no
162 support_xft=no 155 support_xft=no
163 support_unicode3=no 156 support_unicode3=no
164 support_combining=no 157 support_combining=no
169 codesets= 162 codesets=
170 fi 163 fi
171 if test x$enableval = xyes; then 164 if test x$enableval = xyes; then
172 support_frills=yes 165 support_frills=yes
173 support_inheritpixmap=yes 166 support_inheritpixmap=yes
174 support_tinting=yes
175 support_fading=yes 167 support_fading=yes
176 support_keepscrolling=yes 168 support_keepscrolling=yes
177 support_selectionscrolling=yes 169 support_selectionscrolling=yes
178 support_lastlog=yes 170 support_lastlog=yes
179 support_mousewheel=yes 171 support_mousewheel=yes
185 support_scroll_xterm=yes 177 support_scroll_xterm=yes
186 support_scroll_plain=yes 178 support_scroll_plain=yes
187 support_utmp=yes 179 support_utmp=yes
188 support_wtmp=yes 180 support_wtmp=yes
189 support_xim=yes 181 support_xim=yes
190 support_xpm=yes
191 support_afterimage=yes 182 support_afterimage=yes
192 support_afterstep=yes 183 support_afterstep=yes
193 support_xft=yes 184 support_xft=yes
194 support_unicode3=yes 185 support_unicode3=yes
195 support_combining=yes 186 support_combining=yes
199 support_perl=yes 190 support_perl=yes
200 codesets=all 191 codesets=all
201 fi 192 fi
202 ]) 193 ])
203 194
195WARNINGS=no
196AC_ARG_ENABLE(warnings,
197 [ --enable-warnings turn on g++ warnings],
198 [if test x$enableval = xyes; then
199 WARNINGS=yes
200 fi])
201if test x$GXX = xyes; then
202 if test $WARNINGS = yes; then
203 save_CXXFLAGS="$CXXFLAGS"
204 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor"
205 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"])
206 else
207 CXXFLAGS="$CXXFLAGS -w"
208 fi
209fi
210
204AC_ARG_ENABLE(unicode3, 211AC_ARG_ENABLE(unicode3,
205 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters], 212 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters],
206 [if test x$enableval = xyes -o x$enableval = xno; then 213 [if test x$enableval = xyes -o x$enableval = xno; then
207 support_unicode3=$enableval 214 support_unicode3=$enableval
208 fi]) 215 fi])
221 228
222AC_ARG_ENABLE(font-styles, 229AC_ARG_ENABLE(font-styles,
223 [ --enable-font-styles enable bold and italic support], 230 [ --enable-font-styles enable bold and italic support],
224 [if test x$enableval = xyes -o x$enableval = xno; then 231 [if test x$enableval = xyes -o x$enableval = xno; then
225 support_styles=$enableval 232 support_styles=$enableval
226 fi])
227
228AC_ARG_ENABLE(xpm-background,
229 [ --enable-xpm-background enable background pixmaps],
230 [if test x$enableval = xyes -o x$enableval = xno; then
231 support_xpm=$enableval
232 fi]) 233 fi])
233 234
234AC_ARG_ENABLE(afterimage, 235AC_ARG_ENABLE(afterimage,
235 [ --enable-afterimage enable integration with libAfterImage for background images], 236 [ --enable-afterimage enable integration with libAfterImage for background images],
236 [if test x$enableval = xyes -o x$enableval = xno; then 237 [if test x$enableval = xyes -o x$enableval = xno; then
253 [ --enable-transparency enable transparent backgrounds], 254 [ --enable-transparency enable transparent backgrounds],
254 [if test x$enableval = xyes -o x$enableval = xno; then 255 [if test x$enableval = xyes -o x$enableval = xno; then
255 support_inheritpixmap=$enableval 256 support_inheritpixmap=$enableval
256 fi]) 257 fi])
257 258
258AC_ARG_ENABLE(tinting,
259 [ --enable-tinting enable tinting of transparent bg],
260 [if test x$enableval = xyes -o x$enableval = xno; then
261 support_tinting=$enableval
262 fi])
263
264AC_ARG_ENABLE(fading, 259AC_ARG_ENABLE(fading,
265 [ --enable-fading enable colors fading when off focus], 260 [ --enable-fading enable colors fading when off focus],
266 [if test x$enableval = xyes -o x$enableval = xno; then 261 [if test x$enableval = xyes -o x$enableval = xno; then
267 support_fading=$enableval 262 support_fading=$enableval
268 fi]) 263 fi])
283 [ --enable-xterm-scroll enable Xterm style scrollbar], 278 [ --enable-xterm-scroll enable Xterm style scrollbar],
284 [if test x$enableval = xyes -o x$enableval = xno; then 279 [if test x$enableval = xyes -o x$enableval = xno; then
285 support_scroll_xterm=$enableval 280 support_scroll_xterm=$enableval
286 fi]) 281 fi])
287 282
283AC_ARG_ENABLE(plain-scroll,
284 [ --enable-plain-scroll enable plain style scrollbar],
285 [if test x$enableval = xyes -o x$enableval = xno; then
286 support_scroll_plain=$enableval
287 fi])
288
288AC_ARG_ENABLE(perl, 289AC_ARG_ENABLE(perl,
289 [ --enable-perl enable embedded perl interpreter], 290 [ --enable-perl enable embedded perl interpreter],
290 [if test x$enableval = xyes -o x$enableval = xno; then 291 [if test x$enableval = xyes -o x$enableval = xno; then
291 support_perl=$enableval 292 support_perl=$enableval
292 fi]) 293 fi])
293 294
294AC_ARG_ENABLE(plain-scroll,
295 [ --enable-plain-scroll enable plain style scrollbar],
296 [if test x$enableval = xyes -o x$enableval = xno; then
297 support_scroll_plain=$enableval
298 fi])
299
300AC_ARG_WITH(codesets, 295AC_ARG_WITH(codesets,
301 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)], 296 [ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
302 [codesets="$withval"]) 297 [codesets="$withval"])
303 298
304AC_ARG_ENABLE(xim, 299AC_ARG_ENABLE(xim,
305 [ --enable-xim XIM (X Input Method) protocol support], 300 [ --enable-xim XIM (X Input Method) protocol support],
306 [if test x$enableval = xyes -o x$enableval = xno; then 301 [if test x$enableval = xyes -o x$enableval = xno; then
331 support_8bitctrls=$enableval 326 support_8bitctrls=$enableval
332 fi]) 327 fi])
333 328
334RESFALLBACK=Rxvt 329RESFALLBACK=Rxvt
335AC_ARG_ENABLE(fallback, 330AC_ARG_ENABLE(fallback,
336 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)], 331 [ --enable-fallback@<:@=CLASS@:>@ fall back on CLASS resources in addition to URxvt ones (default: Rxvt)],
337 [ 332 [
338 test x$enableval = xyes && enableval=Rxvt 333 test x$enableval = xyes && enableval=Rxvt
339 test x$enableval = xno && enableval= 334 test x$enableval = xno && enableval=
340 RESFALLBACK="$enableval" 335 RESFALLBACK="$enableval"
341 ]) 336 ])
400 [if test x$enableval = xyes -o x$enableval = xno; then 395 [if test x$enableval = xyes -o x$enableval = xno; then
401 support_mousewheel=$enableval 396 support_mousewheel=$enableval
402 fi]) 397 fi])
403 398
404AC_ARG_ENABLE(slipwheeling, 399AC_ARG_ENABLE(slipwheeling,
405 [ --enable-slipwheeling enable slip wheel scrolling (requires previous)], 400 [ --enable-slipwheeling enable slip wheel scrolling (requires --enable-mousewheel)],
406 [if test x$enableval = xyes -o x$enableval = xno; then 401 [if test x$enableval = xyes -o x$enableval = xno; then
407 support_mouseslipwheel=$enableval 402 support_mouseslipwheel=$enableval
408 fi]) 403 fi])
409 404
410AC_ARG_ENABLE(smart-resize, 405AC_ARG_ENABLE(smart-resize,
437 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" 432 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
438 fi]) 433 fi])
439 434
440dnl# -------------------------------------------------------------------------- 435dnl# --------------------------------------------------------------------------
441 436
437LIBEV_M4_AVOID_LIBRT=1
438m4_include([libev/libev.m4])
439
440dnl# --------------------------------------------------------------------------
441
442AC_PATH_PROG(TIC, tic) 442AC_PATH_PROG(TIC, tic, :)
443
444dnl# need a neat way to detect SVR4 or its features
445dnl# in src/command.c we use these functions:
446dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
447dnl# - but are these also defined for other systems?
448
449dnl# hack to find if this is SVR4 -- who knows?
450dnl## AC_MSG_CHECKING(for SVR4)
451dnl## AC_EGREP_CPP(yes,
452dnl## [#if defined (SVR4) || defined (_SVR4) || defined (__svr4__)
453dnl## yes;
454dnl## #endif
455dnl## ], [AC_MSG_RESULT(yes); AC_DEFINE(PERHAPS_SVR4)], AC_MSG_RESULT(perhaps not?))
456 443
457AC_PATH_XTRA 444AC_PATH_XTRA
458
459dnl# the only reasonable way to find libXpm is do-it-yourself
460dnl# only check if we want xpm-background
461 445
462AFTERIMAGE_CFLAGS= 446AFTERIMAGE_CFLAGS=
463AFTERIMAGE_LIBS= 447AFTERIMAGE_LIBS=
464AFTERIMAGE_VERSION= 448AFTERIMAGE_VERSION=
465 449
467 support_afterimage=no 451 support_afterimage=no
468 452
469 if test "x$afterimage_config" = "x" ; then 453 if test "x$afterimage_config" = "x" ; then
470 AC_PATH_PROG(afterimage_config, afterimage-config, no) 454 AC_PATH_PROG(afterimage_config, afterimage-config, no)
471 fi 455 fi
456 if test "x$afterimage_config" != "xno" ; then
472 AC_MSG_CHECKING(for libAfterImage version >= 1.15) 457 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
473 AFTERIMAGE_VERSION=`$afterimage_config --version` 458 xAFTERIMAGE_VERSION=`$afterimage_config --version`
474 if test -n "$AFTERIMAGE_VERSION" ; then 459 if test -n "$xAFTERIMAGE_VERSION" ; then
475 AFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 460 xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
476 AFTERIMAGE_LIBS=`$afterimage_config --libs` 461 xAFTERIMAGE_LIBS=`$afterimage_config --libs`
477 if test "x$AFTERIMAGE_LIBS" != "x"; then 462 if test "x$xAFTERIMAGE_LIBS" != "x"; then
478 libai_ver_major=`echo $AFTERIMAGE_VERSION | cut -f 1 -d .` 463 libai_ver_major=`echo $xAFTERIMAGE_VERSION | cut -f 1 -d .`
479 libai_ver_minor=`echo $AFTERIMAGE_VERSION | cut -f 2 -d .` 464 libai_ver_minor=`echo $xAFTERIMAGE_VERSION | cut -f 2 -d .`
480 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then 465 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then
481 support_afterimage=yes 466 support_afterimage=yes
467 AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS"
468 AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS"
469 AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION"
470 fi
482 fi 471 fi
483 fi 472 fi
484 fi
485
486 if test "x$support_afterimage" = "xyes"; then 473 if test "x$support_afterimage" = "xyes"; then
487 AC_MSG_RESULT($AFTERIMAGE_LIBS) 474 AC_MSG_RESULT($AFTERIMAGE_LIBS)
488 else 475 else
489 AC_MSG_RESULT(no) 476 AC_MSG_RESULT(no)
490 fi 477 fi
491fi
492
493if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then
494 VT_FIND_LIBXPM
495 if test x$no_xpm = xyes; then
496 support_xpm=needsmanualspecification
497 fi 478 fi
498fi 479fi
499 480
500dnl# -------------------------------------------------------------------------- 481dnl# --------------------------------------------------------------------------
501dnl# CHECKING FOR HEADER FILES 482dnl# CHECKING FOR HEADER FILES
502dnl# -------------------------------------------------------------------------- 483dnl# --------------------------------------------------------------------------
503AC_HEADER_SYS_WAIT
504AC_CHECK_HEADERS( \ 484AC_CHECK_HEADERS( \
505 assert.h \ 485 assert.h \
506 fcntl.h \ 486 fcntl.h \
507 stdarg.h \ 487 stdarg.h \
508 stdlib.h \ 488 stdlib.h \
519 wchar.h \ 499 wchar.h \
520 cwchar \ 500 cwchar \
521 clocale \ 501 clocale \
522) 502)
523 503
524AC_HEADER_TIME
525
526dnl# check to allow both <termios.h> and <sys/ioctl.h> 504dnl# check to allow both <termios.h> and <sys/ioctl.h>
527AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl, 505AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
528[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> 506[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
529#include <sys/ioctl.h> 507#include <sys/ioctl.h>
530#ifdef HAVE_TERMIOS_H 508#ifdef HAVE_TERMIOS_H
549 [rxvt_xlib_illegal_access=yes],[rxvt_xlib_illegal_access=no] 527 [rxvt_xlib_illegal_access=yes],[rxvt_xlib_illegal_access=no]
550)]) 528)])
551if test x$rxvt_xlib_illegal_access = xyes; then 529if test x$rxvt_xlib_illegal_access = xyes; then
552 AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it) 530 AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it)
553fi 531fi
554
555AC_C_CONST
556AC_C_INLINE
557
558dnl> AC_HEADER_STDC dnl# skip this test, Sun always fails anyhow.
559 532
560dnl# -------------------------------------------------------------------------- 533dnl# --------------------------------------------------------------------------
561dnl# CHECKING FOR MISSING TYPEDEFS 534dnl# CHECKING FOR MISSING TYPEDEFS
562dnl# -------------------------------------------------------------------------- 535dnl# --------------------------------------------------------------------------
563dnl# Missing typedefs and replacements 536dnl# Missing typedefs and replacements
647AC_SUBST(rxvt_u_intp_define) 620AC_SUBST(rxvt_u_intp_define)
648 621
649dnl# -------------------------------------------------------------------------- 622dnl# --------------------------------------------------------------------------
650dnl# CHECKING FOR LIBRARY FUNCTIONS 623dnl# CHECKING FOR LIBRARY FUNCTIONS
651dnl# -------------------------------------------------------------------------- 624dnl# --------------------------------------------------------------------------
652AC_TYPE_SIGNAL 625AC_CHECK_FUNCS(unsetenv)
653dnl> AC_FUNC_VPRINTF
654
655AC_CHECK_FUNCS( \
656 unsetenv \
657 setutent \
658 on_exit \
659)
660 626
661UTMP_CHECK 627UTMP_CHECK
662 628
663dnl# -------------------------------------------------------------------------- 629dnl# --------------------------------------------------------------------------
664 630
665dnl# find ttys/ttytab
666AC_CACHE_CHECK(where ttys/ttytab is located, rxvt_cv_path_ttytab,
667[for ttys_file in dnl
668 /etc/ttys /etc/ttytab;
669do
670 if test -f "$ttys_file" ; then
671 rxvt_cv_path_ttytab=$ttys_file
672 break
673 fi
674done
675])
676if test x$rxvt_cv_path_ttytab != x; then
677 AC_DEFINE_UNQUOTED(TTYTAB_FILENAME, "$rxvt_cv_path_ttytab", Define location of ttys/ttytab)
678fi
679
680dnl# -------------------------------------------------------------------------- 631dnl# --------------------------------------------------------------------------
681dnl# -------------------------------------------------------------------------- 632dnl# --------------------------------------------------------------------------
682 633
683dnl# this is a really hack test for some basic Xlocale stuff 634dnl# this is a really hack test for some basic Xlocale stuff
684ac_save_LIBS=$LIBS 635save_LIBS=$LIBS
685ac_save_CFLAGS=$CFLAGS 636save_CFLAGS=$CFLAGS
686CFLAGS="$CFLAGS $X_CFLAGS" 637CFLAGS="$CFLAGS $X_CFLAGS"
687LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 638LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
688AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
689[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
690#include <stdlib.h>
691main() {
692char *p;
693if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
694exit (XSupportsLocale() ? 0 : 1);
695else
696exit (1);}]])],[dnl
697 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
698 :])])
699if test x$support_xim = xyes; then 639if test x$support_xim = xyes; then
640 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
641 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
642 #include <stdlib.h>
643 main() {
644 char *p;
645 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
646 exit (XSupportsLocale() ? 0 : 1);
647 else
648 exit (1);}]])],[dnl
649 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
650 :])])
700 if test x$rxvt_cv_func_xlocale = xyes; then 651 if test x$rxvt_cv_func_xlocale = xyes; then
701 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input) 652 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
653 AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
654 [AC_COMPILE_IFELSE([
655 #include <X11/Xlib.h>
656
657 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
658
659 void f() {
660 XIMCallback cb;
661 cb.callback = im_destroy_cb;
662 }
663 ],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)])
664
665 if test x$rxvt_broken_ximcb = xyes; then
666 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
667 fi
702 fi 668 fi
703fi 669fi
704 670
705AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, 671AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
706[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 672[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
707#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) 673#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
708if test x$rxvt_cv_func_xsetlocale = xyes; then 674if test x$rxvt_cv_func_xsetlocale = xyes; then
709 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 675 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
710fi 676fi
711LIBS=$ac_save_LIBS 677LIBS=$save_LIBS
712CFLAGS=$ac_save_CFLAGS 678CFLAGS=$save_CFLAGS
713 679
714AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale, 680AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
715[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])]) 681[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])
716if test x$rxvt_cv_func_setlocale = xyes; then 682if test x$rxvt_cv_func_setlocale = xyes; then
717 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works) 683 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
723 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) 689 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
724fi 690fi
725 691
726SCM_RIGHTS_CHECK 692SCM_RIGHTS_CHECK
727 693
728AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
729[AC_COMPILE_IFELSE([
730#include <X11/Xlib.h>
731
732void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
733
734void f() {
735 XIMCallback cb;
736 cb.callback = im_destroy_cb;
737}
738],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)])
739
740if test x$rxvt_broken_ximcb = xyes; then
741 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
742fi
743
744PTY_CHECK 694PTY_CHECK
745 695
746TTY_GROUP_CHECK 696TTY_GROUP_CHECK
747 697
748dnl# -------------------------------------------------------------------------- 698dnl# --------------------------------------------------------------------------
749dnl# now add and remove other stuff 699dnl# now add and remove other stuff
750dnl# -------------------------------------------------------------------------- 700dnl# --------------------------------------------------------------------------
751if test x$support_xft = xyes; then 701if test x$support_xft = xyes; then
752 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 702 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
753 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 703 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
754 LIBS="$LIBS `$PKG_CONFIG xft --libs`" 704 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
755 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 705 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
756 else 706 else
757 AC_PATH_PROG(XFT_CONFIG, xft-config, no) 707 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
758 if test $XFT_CONFIG != no; then 708 if test $XFT_CONFIG != no; then
759 LIBS="$LIBS `$XFT_CONFIG --libs`" 709 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
760 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 710 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
761 fi 711 fi
762 fi 712 fi
763 713
714 save_LIBS="$LIBS"
715 LIBS="$LIBS $X_LIBS"
764 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 716 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
765 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no]) 717 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
718 LIBS="$save_LIBS"
766 719
767 if test x$support_xft = xyes; then 720 if test x$support_xft = xyes; then
768 AC_DEFINE(XFT, 1, Define to enable xft support) 721 AC_DEFINE(XFT, 1, Define to enable xft support)
769 fi 722 fi
770fi 723fi
778 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences) 731 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
779fi 732fi
780if test x$support_fading = xyes; then 733if test x$support_fading = xyes; then
781 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) 734 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
782fi 735fi
783if test x$support_tinting = xyes; then
784 AC_DEFINE(TINTING, 1, Define if you want your background to be tinted)
785fi
786if test x$support_inheritpixmap = xyes; then 736if test x$support_inheritpixmap = xyes; then
787 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background) 737 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
788fi 738fi
789if test x$support_keepscrolling = xno; then 739if test x$support_keepscrolling = xno; then
790 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) 740 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
791fi 741fi
792if test x$support_selectionscrolling = xyes; then 742if test x$support_selectionscrolling = xyes; then
793 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen) 743 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)
794fi 744fi
745if test x$support_frills = xyes; then
746 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
747fi
795if test x$support_mousewheel = xyes; then 748if test x$support_mousewheel = xyes; then
796 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) 749 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
797fi 750fi
798if test x$support_mouseslipwheel = xyes; then 751if test x$support_mouseslipwheel = xyes; then
799 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling) 752 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
800fi 753fi
801if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then
802 AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage)
803fi
804
805if test x$support_afterimage = xyes; then 754if test x$support_afterimage = xyes; then
806 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing) 755 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
756 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps. Needs libAfterImage)
807fi 757fi
808 758
809dnl if test x$support_afterstep = xyes; then 759dnl if test x$support_afterstep = xyes; then
810dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager) 760dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)
811dnl fi 761dnl fi
895AC_SUBST(PERLPRIVLIBEXP) 845AC_SUBST(PERLPRIVLIBEXP)
896AC_SUBST(PERL) 846AC_SUBST(PERL)
897AC_SUBST(IF_PERL) 847AC_SUBST(IF_PERL)
898AC_SUBST(PERL_O) 848AC_SUBST(PERL_O)
899 849
900if test x$support_perl = xyes; then
901 support_frills=yes
902fi
903
904if test x$support_frills = xyes; then
905 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
906fi
907
908AC_SUBST(CFLAGS) 850AC_SUBST(CFLAGS)
909AC_SUBST(CPPFLAGS) 851AC_SUBST(CPPFLAGS)
910AC_SUBST(LDFLAGS) 852AC_SUBST(LDFLAGS)
911AC_SUBST(X_CFLAGS) 853AC_SUBST(X_CFLAGS)
912 854
959 Install path: ${prefix}/bin 901 Install path: ${prefix}/bin
960 Compiler: $CXX 902 Compiler: $CXX
961 Compiler flags: $CXXFLAGS 903 Compiler flags: $CXXFLAGS
962 Linker: $LINKER" 904 Linker: $LINKER"
963 905
964if test x$support_xpm = xyes; then
965 echo " Xpm library: $XPM_LIBS"
966fi
967
968if test x$support_afterimage = xyes; then
969 echo " AfterImage support: yes"
970fi
971
972dnl if test x$support_afterstep = xyes; then
973dnl echo " AfterStep integration: yes"
974dnl fi
975
976if test x$term != x; then 906if test x$term != x; then
977 echo " set TERM to: $term" 907 echo " set TERM to: $term"
978fi 908fi
979if test x$terminfo != x; then 909if test x$terminfo != x; then
980 echo " set TERMINFO to: $terminfo" 910 echo " set TERMINFO to: $terminfo"
984if test x$RESFALLBACK != x; then 914if test x$RESFALLBACK != x; then
985 echo " resource class fallback: $RESFALLBACK" 915 echo " resource class fallback: $RESFALLBACK"
986fi 916fi
987echo 917echo
988echo " embedded perl: $support_perl" 918echo " embedded perl: $support_perl"
919echo " libafterimage: $support_afterimage"
920dnl echo " AfterStep integration: $support_afterstep"
989echo 921echo
990if test x$support_xpm = xneedsmanualspecification; then
991 echo ".----------------------------------------------------------------."
992 echo ". WARNING: --enable-xpm-background was specified however the ."
993 echo ". XPM includes files and libraries could not be found. ."
994 echo ". XPM backgrounds are now being DISABLED! If you want ."
995 echo ". to use them you should rerun configure with the ."
996 echo ". appropriate --with-xpm-includes=/path/to/xpm/includes ."
997 echo ". and --with-xpm-library=/path/to/xpm/library lines. ."
998 echo ".----------------------------------------------------------------."
999fi
1000if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then 922if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then
1001 echo ".----------------------------------------------------------------." 923 echo ".----------------------------------------------------------------."
1002 echo ". WARNING: --enable-xim was specified however the locale support ." 924 echo ". WARNING: --enable-xim was specified however the locale support ."
1003 echo ". functions could not be found. ." 925 echo ". functions could not be found. ."
1004 echo ". XIM is now being DISABLED! ." 926 echo ". XIM is now being DISABLED! ."

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines