ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/autoconf/configure.in
(Generate patch)

Comparing rxvt-unicode/autoconf/configure.in (file contents):
Revision 1.23 by pcg, Sun Mar 14 23:14:39 2004 UTC vs.
Revision 1.54 by root, Tue Oct 25 20:04:58 2005 UTC

1dnl# -*- sh -*- 1dnl# -*- sh -*-
2dnl# 2dnl#
3dnl# Process this file with autoconf to produce a configure script. 3dnl# Process this file with autoconf to produce a configure script.
4dnl# 4dnl#
5AC_INIT(src/feature.h) 5orig_CXXFLAGS="$CXXFLAGS"
6
7AC_INIT
8AC_CONFIG_SRCDIR([src/feature.h])
6AC_CONFIG_AUX_DIR(autoconf) 9AC_CONFIG_AUX_DIR(autoconf)
7AC_CONFIG_HEADER(config.h:autoconf/config.h.in) 10AC_CONFIG_HEADER(config.h:autoconf/config.h.in)
11
12AC_CANONICAL_HOST
8 13
9dnl RXVT version 14dnl RXVT version
10changequote(, )dnl 15changequote(, )dnl
11VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 16VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
12DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 17DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
13LSMDATE=`sed -n -e 's/^.*[ \t]LSMDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
14LIBVERSION=`sed -n -e 's/^.*[ \t]LIBVERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 18dnl LIBVERSION=`sed -n -e 's/^.*[ \t]LIBVERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
15changequote([, ])dnl 19changequote([, ])dnl
16AC_SUBST(VERSION)dnl 20AC_SUBST(VERSION)dnl
17AC_SUBST(DATE)dnl 21AC_SUBST(DATE)dnl
18AC_SUBST(LSMDATE)dnl 22AC_SUBST(LSMDATE)dnl
19AC_SUBST(LIBVERSION)dnl 23AC_SUBST(LIBVERSION)dnl
… …
30AC_PROG_INSTALL 34AC_PROG_INSTALL
31AC_PROG_AWK 35AC_PROG_AWK
32 36
33AC_LANG(C) 37AC_LANG(C)
34 38
39dnl# --------------------------------------------------------------------------
40dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
41dnl#
42if test -z "$orig_CXXFLAGS"; then
43 CXXFLAGS='-O'
44 if test x$GCC = xyes && test "x$GXX" = xyes; then
45 CXXFLAGS="-g -O3"
46 fi
47 CFLAGS="$CXXFLAGS"
48fi
49
35LINKER="$CXX" 50LINKER="$CXX"
36if test x$GCC = xyes && test x$GXX = xyes; then 51if test x$GCC = xyes && test x$GXX = xyes; then
37 AC_CHECK_LIB(supc++, main, [ 52 AC_CHECK_LIB(supc++, main, [
38 LINKER="$CC" 53 LINKER="$CC"
39 LIBS="$LIBS -lsupc++" 54 LIBS="$LIBS -lsupc++"
40 ]) 55 ])
41fi 56fi
42AC_SUBST(LINKER,[$LINKER]) 57AC_SUBST(LINKER,[$LINKER])
43 58
44CPPFLAGS="-D_GNU_SOURCE -D_XOPEN_SOURCE" 59AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)
45 60
61case $host in
62 *-*-solaris* )
63 AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
64 AC_DEFINE(_XOPEN_SOURCE, 2, Needed to get declarations for msg_control and msg_controllen on Solaris)
65 AC_DEFINE(__EXTENSIONS__, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
66 ;;
67esac
68
46if test x$GXX = xyes; then 69dnl if test x$GXX = xyes; then
47 CXXFLAGS="$CXXFLAGS -fno-exceptions" 70dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now...
48fi 71dnl fi
49 72
50AC_LANG(C++) 73AC_LANG(C++)
51 74
52dnl# system hacks 75dnl# system hacks
53AC_AIX 76AC_AIX
54AC_ISC_POSIX 77AC_ISC_POSIX
55 78
79dnl# FreeBSD needs to link libxpg4
80AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])
81
82dnl solaris needs to link libnsl and socket
83AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])
84AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])
85
56AC_ENABLE_SHARED(no)dnl# libtool 86dnl AC_ENABLE_SHARED(no)dnl# libtool
57AC_ENABLE_STATIC(yes)dnl# libtool 87dnl AC_ENABLE_STATIC(yes)dnl# libtool
58AC_PROG_LIBTOOL()dnl# libtool 88dnl AC_PROG_LIBTOOL()dnl# libtool
59 89
60MALLOC_TYPE=S 90MALLOC_TYPE=S
91
61support_addstrings=no 92support_addstrings=no
62support_frills=no 93support_frills=yes
63support_linespace=no
64support_inheritpixmap=no 94support_inheritpixmap=no
95support_tinting=yes
96support_fading=yes
65support_keepscrolling=no 97support_keepscrolling=yes
66support_selectionscrolling=no 98support_selectionscrolling=yes
67support_menubar=no 99support_menubar=no
68support_mousewheel=no 100support_mousewheel=yes
69support_mouseslipwheel=no 101support_mouseslipwheel=yes
70support_utmp=no 102support_utmp=yes
71support_wtmp=no 103support_wtmp=yes
72support_lastlog=no 104support_lastlog=yes
73support_cursor_blink=no
74support_text_blink=no 105support_text_blink=yes
75support_pointer_blank=no 106support_pointer_blank=yes
76support_scroll_rxvt=no 107support_scroll_rxvt=yes
77support_scroll_next=no 108support_scroll_next=yes
78support_scroll_xterm=no 109support_scroll_xterm=yes
79support_scroll_plain=no 110support_scroll_plain=yes
80support_xim=no 111support_xim=yes
81support_xpm=no 112support_xpm=no
82support_xft=no 113support_xft=yes
83support_unicode3=no 114support_unicode3=no
84support_combining=no 115support_combining=yes
116support_8bitctrls=no
117support_iso14755=yes
118support_styles=yes
85codesets= 119codesets=all
86 120
87dnl# -------------------------------------------------------------------------- 121dnl# --------------------------------------------------------------------------
88dnl# CHECKING COMMAND LINE OPTIONS 122dnl# CHECKING COMMAND LINE OPTIONS
89dnl# -------------------------------------------------------------------------- 123dnl# --------------------------------------------------------------------------
90 124
… …
96 130
97AC_ARG_ENABLE(everything, 131AC_ARG_ENABLE(everything,
98 [ --enable-everything enable standard non-multichoice features 132 [ --enable-everything enable standard non-multichoice features
99 NOTE: this option is order dependent 133 NOTE: this option is order dependent
100 NOTE: automatically enabled with --enable-shared], 134 NOTE: automatically enabled with --enable-shared],
135 [
136 if test x$enableval = xno; then
137 support_24bit=no
138 support_frills=no
139 support_inheritpixmap=no
140 support_tinting=no
141 support_fading=no
142 support_keepscrolling=no
143 support_selectionscrolling=no
144 support_lastlog=no
145 support_menubar=no
146 support_mousewheel=no
147 support_mouseslipwheel=no
148 support_text_blink=no
149 support_pointer_blank=no
150 support_scroll_rxvt=no
151 support_scroll_next=no
152 support_scroll_xterm=no
153 support_scroll_plain=no
154 support_utmp=no
155 support_wtmp=no
156 support_xim=no
157 support_xpm=no
158 support_xft=no
159 support_unicode3=no
160 support_combining=no
161 support_8bitctrls=no
162 support_iso14755=no
163 support_styles=no
164 codesets=
165 fi
101 [if test x$enableval = xyes; then 166 if test x$enableval = xyes; then
102 support_24bit=yes 167 support_24bit=yes
103 support_frills=yes 168 support_frills=yes
104 support_linespace=yes
105 support_inheritpixmap=yes 169 support_inheritpixmap=yes
170 support_tinting=yes
171 support_fading=yes
106 support_keepscrolling=yes 172 support_keepscrolling=yes
107 support_selectionscrolling=yes 173 support_selectionscrolling=yes
108 support_lastlog=yes 174 support_lastlog=yes
109 support_menubar=yes 175 support_menubar=yes
110 support_mousewheel=yes 176 support_mousewheel=yes
111 support_mouseslipwheel=yes 177 support_mouseslipwheel=yes
112 support_cursor_blink=yes
113 support_text_blink=yes 178 support_text_blink=yes
114 support_pointer_blank=yes 179 support_pointer_blank=yes
115 support_scroll_rxvt=yes 180 support_scroll_rxvt=yes
116 support_scroll_next=yes 181 support_scroll_next=yes
117 support_scroll_xterm=yes 182 support_scroll_xterm=yes
118 support_scroll_plain=yes 183 support_scroll_plain=yes
119 support_utmp=yes 184 support_utmp=yes
120 support_wtmp=yes 185 support_wtmp=yes
121 support_xim=yes 186 support_xim=yes
122 support_xpm=yes 187 support_xpm=yes
123 support_xft=yes 188 support_xft=yes
124 support_unicode3=yes 189 support_unicode3=yes
125 support_combining=yes 190 support_combining=yes
191 #support_8bitctrls=yes
192 support_iso14755=yes
193 support_styles=yes
126 codesets=all 194 codesets=all
195 fi
127 fi]) 196 ])
128 197
129AC_ARG_ENABLE(unicode3, 198AC_ARG_ENABLE(unicode3,
130 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters], 199 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters],
131 [if test x$enableval = xyes -o x$enableval = xno; then 200 [if test x$enableval = xyes -o x$enableval = xno; then
132 support_unicode3=yes 201 support_unicode3=$enableval
133 fi]) 202 fi])
134 203
135AC_ARG_ENABLE(combining, 204AC_ARG_ENABLE(combining,
136 [ --enable-combining enable composition of base and combining characters], 205 [ --enable-combining enable composition of base and combining characters],
137 [if test x$enableval = xyes -o x$enableval = xno; then 206 [if test x$enableval = xyes -o x$enableval = xno; then
138 support_combining=yes 207 support_combining=$enableval
139 fi]) 208 fi])
140 209
141AC_ARG_ENABLE(xft, 210AC_ARG_ENABLE(xft,
142 [ --enable-xft enable xft support on systems that have it], 211 [ --enable-xft enable xft support on systems that have it],
143 [if test x$enableval = xyes -o x$enableval = xno; then 212 [if test x$enableval = xyes -o x$enableval = xno; then
144 support_xft=yes 213 support_xft=$enableval
214 fi])
215
216AC_ARG_ENABLE(font-styles,
217 [ --enable-font-styles enable bold and italic support],
218 [if test x$enableval = xyes -o x$enableval = xno; then
219 support_styles=$enableval
145 fi]) 220 fi])
146 221
147AC_ARG_ENABLE(utmp, 222AC_ARG_ENABLE(utmp,
148 [ --enable-utmp enable utmp (utmpx) support], 223 [ --enable-utmp enable utmp (utmpx) support],
149 [if test x$enableval = xyes -o x$enableval = xno; then 224 [if test x$enableval = xyes -o x$enableval = xno; then
… …
170 245
171AC_ARG_ENABLE(transparency, 246AC_ARG_ENABLE(transparency,
172 [ --enable-transparency enable transparent backgrounds], 247 [ --enable-transparency enable transparent backgrounds],
173 [if test x$enableval = xyes -o x$enableval = xno; then 248 [if test x$enableval = xyes -o x$enableval = xno; then
174 support_inheritpixmap=$enableval 249 support_inheritpixmap=$enableval
250 fi])
251
252AC_ARG_ENABLE(tinting,
253 [ --enable-tinting enable tinting of transparent bg],
254 [if test x$enableval = xyes -o x$enableval = xno; then
255 support_tinting=$enableval
256 fi])
257
258AC_ARG_ENABLE(fading,
259 [ --enable-fading enable colors fading when off focus],
260 [if test x$enableval = xyes -o x$enableval = xno; then
261 support_fading=$enableval
175 fi]) 262 fi])
176 263
177AC_ARG_ENABLE(menubar, 264AC_ARG_ENABLE(menubar,
178 [ --enable-menubar enable menubar], 265 [ --enable-menubar enable menubar],
179 [if test x$enableval = xyes -o x$enableval = xno; then 266 [if test x$enableval = xyes -o x$enableval = xno; then
… …
209 [if test x$enableval = xyes; then 296 [if test x$enableval = xyes; then
210 AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less) 297 AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less)
211 fi]) 298 fi])
212 299
213AC_ARG_WITH(codesets, 300AC_ARG_WITH(codesets,
214 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,cn,cn_ext,all)], 301 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
215 [codesets="$withval"]) 302 [codesets="$withval"])
216 303
217AC_ARG_ENABLE(xim, 304AC_ARG_ENABLE(xim,
218 [ --enable-xim XIM (X Input Method) protocol support], 305 [ --enable-xim XIM (X Input Method) protocol support],
219 [if test x$enableval = xyes -o x$enableval = xno; then 306 [if test x$enableval = xyes -o x$enableval = xno; then
… …
246 333
247AC_ARG_ENABLE(xgetdefault, 334AC_ARG_ENABLE(xgetdefault,
248 [ --enable-xgetdefault enable resources via X instead of our small version], 335 [ --enable-xgetdefault enable resources via X instead of our small version],
249 [if test x$enableval = xyes; then 336 [if test x$enableval = xyes; then
250 AC_DEFINE(USE_XGETDEFAULT, 1, Define if you want to use XGetDefault instead of our internal version) 337 AC_DEFINE(USE_XGETDEFAULT, 1, Define if you want to use XGetDefault instead of our internal version)
338 fi])
339
340AC_ARG_ENABLE(8bitctrls,
341 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)],
342 [if test x$enableval = xyes -o x$enableval = xno; then
343 support_8bitctrls=$enableval
251 fi]) 344 fi])
252 345
253RESFALLBACK=Rxvt 346RESFALLBACK=Rxvt
254AC_ARG_ENABLE(fallback, 347AC_ARG_ENABLE(fallback,
255 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)], 348 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)],
… …
277 370
278RXVTNAME=urxvt 371RXVTNAME=urxvt
279AC_ARG_WITH(name, 372AC_ARG_WITH(name,
280 [ --with-name=NAME set the basename for the installed binaries (default: urxvt)], 373 [ --with-name=NAME set the basename for the installed binaries (default: urxvt)],
281 [RXVTNAME="$withval"]) 374 [RXVTNAME="$withval"])
375AC_DEFINE_UNQUOTED(RXVTNAME,"$RXVTNAME", [Binary base name])
282 376
283RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"` 377RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"`
284AC_SUBST(RXVTNAME) 378AC_SUBST(RXVTNAME)
285 379
286AC_ARG_ENABLE(strings, 380AC_ARG_ENABLE(strings,
… …
293 [ --disable-swapscreen disable swap screen support], 387 [ --disable-swapscreen disable swap screen support],
294 [if test x$enableval = xno; then 388 [if test x$enableval = xno; then
295 AC_DEFINE(NO_SECONDARY_SCREEN, 1, Disable the secondary screen. Many programs use the secondary screen as their workplace) 389 AC_DEFINE(NO_SECONDARY_SCREEN, 1, Disable the secondary screen. Many programs use the secondary screen as their workplace)
296 fi]) 390 fi])
297 391
392AC_ARG_ENABLE(iso14755,
393 [ --enable-iso14755 enable support for extended ISO 14755 modes],
394 [if test x$enableval = xyes -o x$enableval = xno; then
395 support_iso14755=$enableval
396 fi])
397
298AC_ARG_ENABLE(frills, 398AC_ARG_ENABLE(frills,
299 [ --enable-frills enable support for rarely used features], 399 [ --enable-frills enable support for rarely used features],
300 [if test x$enableval = xyes -o x$enableval = xno; then 400 [if test x$enableval = xyes -o x$enableval = xno; then
301 support_frills=$enableval 401 support_frills=$enableval
302 fi])
303
304AC_ARG_ENABLE(linespace,
305 [ --enable-linespace enable support for linespace],
306 [if test x$enableval = xyes -o x$enableval = xno; then
307 support_linespace=$enableval
308 fi]) 402 fi])
309 403
310AC_ARG_ENABLE(24bit, 404AC_ARG_ENABLE(24bit,
311 [ --enable-24bit enable support for using 24bit visuals if available], 405 [ --enable-24bit enable support for using 24bit visuals if available],
312 [if test x$enableval = xyes -o x$enableval = xno; then 406 [if test x$enableval = xyes -o x$enableval = xno; then
… …
360 [ --enable-smart-resize enable smart growth/shrink behaviour], 454 [ --enable-smart-resize enable smart growth/shrink behaviour],
361 [if test x$enableval = xyes; then 455 [if test x$enableval = xyes; then
362 AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior) 456 AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior)
363 fi]) 457 fi])
364 458
365AC_ARG_ENABLE(256-color,
366 [ --enable-256-color enable 256-color support],
367 [if test x$enableval = xyes; then
368 AC_DEFINE(TTY_256COLOR, 1, Define if you want 256 colour support)
369 fi])
370
371AC_ARG_ENABLE(cursor-blink,
372 [ --enable-cursor-blink enable blinking cursor],
373 [if test x$enableval = xyes -o x$enableval = xno; then
374 support_cursor_blink=$enableval
375 fi])
376
377AC_ARG_ENABLE(text-blink, 459AC_ARG_ENABLE(text-blink,
378 [ --enable-text-blink enable blinking text], 460 [ --enable-text-blink enable blinking text],
379 [if test x$enableval = xyes -o x$enableval = xno; then 461 [if test x$enableval = xyes -o x$enableval = xno; then
380 support_text_blink=$enableval 462 support_text_blink=$enableval
381 fi]) 463 fi])
… …
399 fi]) 481 fi])
400 482
401dnl# -------------------------------------------------------------------------- 483dnl# --------------------------------------------------------------------------
402 484
403AC_DEFINE(PROTOTYPES, 1, Define if you need function prototypes) 485AC_DEFINE(PROTOTYPES, 1, Define if you need function prototypes)
404
405dnl# --------------------------------------------------------------------------
406dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
407dnl#
408if test -z "$CFLAGS"; then
409 if test -z "$CCOPTS"; then
410 CCOPTS='-O'
411dnl> if test "x$GCC" = xyes; then
412dnl> if test x$system = xLinux; then
413dnl> CCOPTS="$CCOPTS "'-O2 -fno-strength-reduce'
414dnl> fi
415dnl> fi
416 fi
417 CFLAGS="$CCOPTS"
418fi
419 486
420AC_PATH_PROG(MV, mv, mv) 487AC_PATH_PROG(MV, mv, mv)
421AC_PATH_PROG(RM, rm, rm) 488AC_PATH_PROG(RM, rm, rm)
422AC_PATH_PROG(CP, cp, cp) 489AC_PATH_PROG(CP, cp, cp)
423AC_PATH_PROG(LN, ln, ln) 490AC_PATH_PROG(LN, ln, ln)
424AC_PATH_PROG(SED, sed, sed) 491AC_PATH_PROG(SED, sed, sed)
425AC_PATH_PROG(ECHO, echo, echo) 492AC_PATH_PROG(ECHO, echo, echo)
426AC_PATH_PROG(CMP, cmp, cmp) 493AC_PATH_PROG(CMP, cmp, cmp)
427AC_PATH_PROG(TBL, tbl) 494AC_PATH_PROG(TBL, tbl)
495AC_PATH_PROG(TIC, tic)
428 496
429dnl# need a neat way to detect SVR4 or its features 497dnl# need a neat way to detect SVR4 or its features
430dnl# in src/command.c we use these functions: 498dnl# in src/command.c we use these functions:
431dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> 499dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
432dnl# - but are these also defined for other systems? 500dnl# - but are these also defined for other systems?
… …
469 sys/byteorder.h \ 537 sys/byteorder.h \
470 sys/ioctl.h \ 538 sys/ioctl.h \
471 sys/select.h \ 539 sys/select.h \
472 sys/sockio.h \ 540 sys/sockio.h \
473 sys/strredir.h \ 541 sys/strredir.h \
542 sys/stropts.h \
474 sys/time.h \ 543 sys/time.h \
475 utmp.h \ 544 utmp.h \
476 utmpx.h \ 545 utmpx.h \
477 stdint.h \ 546 stdint.h \
547 pty.h \
548 wchar.h \
549 cwchar \
550 clocale \
478) 551)
479 552
480AC_HEADER_TIME 553AC_HEADER_TIME
481 554
482dnl# check to allow both <termios.h> and <sys/ioctl.h> 555dnl# check to allow both <termios.h> and <sys/ioctl.h>
483AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl, 556AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
484[AC_TRY_COMPILE([#include <stdio.h> 557[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
485#include <sys/ioctl.h> 558#include <sys/ioctl.h>
486#ifdef HAVE_TERMIOS_H 559#ifdef HAVE_TERMIOS_H
487#include <termios.h> 560#include <termios.h>
488#endif], [int a = ECHO;], rxvt_cv_header_sysioctl=yes, rxvt_cv_header_sysioctl=no)]) 561#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
489 562
490dnl# ELF systems may want to store paths for dynamic libraries. 563dnl# ELF systems may want to store paths for dynamic libraries.
491dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath" 564dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath"
492dnl# At least one version of SunOS wants "-R path" but it's not checked yet. 565dnl# At least one version of SunOS wants "-R path" but it's not checked yet.
493if test -n "$GCC"; then 566if test -n "$GCC"; then
… …
502ac_save_CFLAGS=$CFLAGS 575ac_save_CFLAGS=$CFLAGS
503ac_save_LIBS=$LIBS 576ac_save_LIBS=$LIBS
504CFLAGS="$CFLAGS $X_CFLAGS" 577CFLAGS="$CFLAGS $X_CFLAGS"
505LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` 578LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
506AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath, 579AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath,
507[AC_TRY_RUN([ 580[AC_RUN_IFELSE([AC_LANG_SOURCE([[
508main() 581main()
509{ 582{
510 exit(0); 583 exit(0);
511 (void) XOpenDisplay("foobar"); 584 (void) XOpenDisplay("foobar");
512}], rxvt_cv_rpath=yes, rxvt_cv_rpath=no, dnl 585}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
513 AC_MSG_WARN([You may need to check the LIBS line]))]) 586 AC_MSG_WARN(You may need to check the LIBS line)])])
514if test x$rxvt_cv_rpath != xyes; then 587if test x$rxvt_cv_rpath != xyes; then
515 changequote(, )dnl 588 changequote(, )dnl
516 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g' 589 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
517 changequote([, ])dnl 590 changequote([, ])dnl
518 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` 591 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
519 AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R, 592 AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R,
520[AC_TRY_RUN([ 593[AC_RUN_IFELSE([AC_LANG_SOURCE([[
521main() 594main()
522{ 595{
523 exit(0); 596 exit(0);
524 (void) XOpenDisplay("foobar"); 597 (void) XOpenDisplay("foobar");
525}], rxvt_cv_R=yes, rxvt_cv_R=no, rxvt_cv_R=no)]) 598}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])
526 if test x$rxvt_cv_R != xyes; then 599 if test x$rxvt_cv_R != xyes; then
527 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 600 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
528 fi 601 fi
529fi 602fi
530 603
531AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 604AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
532[AC_TRY_COMPILE([#include <X11/Xlib.h>], [XPointer dummy;], 605[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
533rxvt_cv_xpointer=yes, rxvt_cv_xpointer=no)])
534if test x$rxvt_cv_xpointer = xyes; then 606if test x$rxvt_cv_xpointer = xyes; then
535 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 607 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
536fi 608fi
537LIBS=$ac_save_LIBS 609LIBS=$ac_save_LIBS
538CFLAGS=$ac_save_CFLAGS 610CFLAGS=$ac_save_CFLAGS
… …
551dnl> AC_CHECK_TYPE(umode_t, int) 623dnl> AC_CHECK_TYPE(umode_t, int)
552dnl> AC_CHECK_TYPE(off_t, long) 624dnl> AC_CHECK_TYPE(off_t, long)
553AC_TYPE_PID_T 625AC_TYPE_PID_T
554AC_TYPE_UID_T 626AC_TYPE_UID_T
555 627
556
557AC_CHECK_SIZEOF(char, 1)
558AC_CHECK_SIZEOF(short, 2) 628AC_CHECK_SIZEOF(short, 2)
559AC_CHECK_SIZEOF(int, 4) 629AC_CHECK_SIZEOF(int, 4)
560AC_CHECK_SIZEOF(long, 4) 630dnl AC_CHECK_SIZEOF(long, 4)
561AC_CHECK_SIZEOF(long long, 8) 631AC_CHECK_SIZEOF(long long, 8)
562AC_CHECK_SIZEOF(int *, 4) 632AC_CHECK_SIZEOF(int *, 4)
563 633
564dnl# see usage below 634dnl# see usage below
565AC_DEFUN(RXVT_CHECK_SIZE, 635AC_DEFUN(RXVT_CHECK_SIZE,
566 [AC_CACHE_CHECK([for $2], $1, 636 [AC_CACHE_CHECK([for $2], $1,
567 [AC_TRY_COMPILE([#include <stdint.h>], $2 dummy;, 637 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl
568 [$1=yes],
569 [dnl
570if test $ac_cv_sizeof_char -ge $3; then 638if test "$ac_cv_sizeof_char" -ge $3; then
571 $1="$4 char" 639 $1="$4 char"
572else 640else
573 if test $ac_cv_sizeof_short -ge $3; then 641 if test "$ac_cv_sizeof_short" -ge $3; then
574 $1="$4 short" 642 $1="$4 short"
575 else 643 else
576 if test $ac_cv_sizeof_int -ge $3; then 644 if test "$ac_cv_sizeof_int" -ge $3; then
577 $1="$4 int" 645 $1="$4 int"
578 else 646 else
579 if test $ac_cv_sizeof_long -ge $3; then 647 if test "$ac_cv_sizeof_long" -ge $3; then
580 $1="$4 long" 648 $1="$4 long"
581 else 649 else
582 if test $ac_cv_sizeof_long_long -ge $3; then 650 if test "$ac_cv_sizeof_long_long" -ge $3; then
583 $1="$4 long long" 651 $1="$4 long long"
584 else 652 else
585 $1="$4 $5" # we _must_ have a (possibly wrong) default 653 $1="$4 $5" # we _must_ have a (possibly wrong) default
586 fi 654 fi
587 fi 655 fi
… …
614dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef) 682dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
615dnl AC_SUBST(rxvt_uint64_typedef) 683dnl AC_SUBST(rxvt_uint64_typedef)
616dnl# 684dnl#
617dnl# Now look for another we use 685dnl# Now look for another we use
618dnl# 686dnl#
619if test $ac_cv_sizeof_int_p -eq 8; then 687if test "$ac_cv_sizeof_int_p" -eq 8; then
620 rxvt_intp_define="#define intp_t int64_t" 688 rxvt_intp_define="#define intp_t int64_t"
621 rxvt_u_intp_define="#define u_intp_t u_int64_t" 689 rxvt_u_intp_define="#define u_intp_t u_int64_t"
622else 690else
623 if test $ac_cv_sizeof_int_p -eq 4; then 691 if test "$ac_cv_sizeof_int_p" -eq 4; then
624 rxvt_intp_define="#define intp_t int32_t" 692 rxvt_intp_define="#define intp_t int32_t"
625 rxvt_u_intp_define="#define u_intp_t u_int32_t" 693 rxvt_u_intp_define="#define u_intp_t u_int32_t"
626 else 694 else
627 if test $ac_cv_sizeof_int_p -eq 2; then 695 if test "$ac_cv_sizeof_int_p" -eq 2; then
628 rxvt_intp_define="#define intp_t int16_t" 696 rxvt_intp_define="#define intp_t int16_t"
629 rxvt_u_intp_define="#define u_intp_t u_int16_t" 697 rxvt_u_intp_define="#define u_intp_t u_int16_t"
630 else 698 else
631 rxvt_intp_define="#error set intp_t" 699 rxvt_intp_define="#error set intp_t"
632 rxvt_u_intp_define="#error set u_intp_t" 700 rxvt_u_intp_define="#error set u_intp_t"
… …
664 unlockpt \ 732 unlockpt \
665 isastream \ 733 isastream \
666 on_exit \ 734 on_exit \
667 nanosleep \ 735 nanosleep \
668 updwtmp \ 736 updwtmp \
737 updwtmpx \
669 ttyslot \ 738 ttyslot \
670) 739)
671dnl# Note: On NetBSD, openpty() exists in libutil. Don't pull it in 740dnl# Note: On NetBSD, openpty() exists in libutil. Don't pull it in
672 741
673dnl# -------------------------------------------------------------------------- 742dnl# --------------------------------------------------------------------------
… …
676dnl# check for host field in utmp structure 745dnl# check for host field in utmp structure
677 746
678dnl# -------------------------------------------- 747dnl# --------------------------------------------
679AC_CHECK_HEADER(utmp.h, 748AC_CHECK_HEADER(utmp.h,
680[AC_CACHE_CHECK([for struct utmp], rxvt_cv_struct_utmp, 749[AC_CACHE_CHECK([for struct utmp], rxvt_cv_struct_utmp,
681[AC_TRY_COMPILE([#include <sys/types.h> 750[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
682#include <stdint.h> 751#include <stdint.h>
683#include <utmp.h>], 752#include <utmp.h>]], [[struct utmp ut;]])],[rxvt_cv_struct_utmp=yes],[rxvt_cv_struct_utmp=no])])
684[struct utmp ut;],
685rxvt_cv_struct_utmp=yes, rxvt_cv_struct_utmp=no)])
686if test x$rxvt_cv_struct_utmp = xyes; then 753if test x$rxvt_cv_struct_utmp = xyes; then
687 AC_DEFINE(HAVE_STRUCT_UTMP, 1, Define if utmp.h has struct utmp) 754 AC_DEFINE(HAVE_STRUCT_UTMP, 1, Define if utmp.h has struct utmp)
688fi 755fi
689] 756]
690 757
691AC_CACHE_CHECK(for ut_host in utmp struct, rxvt_cv_struct_utmp_host, 758AC_CACHE_CHECK(for ut_host in utmp struct, rxvt_cv_struct_utmp_host,
692[AC_TRY_COMPILE([#include <sys/types.h> 759[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
693#include <utmp.h>], 760#include <utmp.h>]], [[struct utmp ut; ut.ut_host;]])],[rxvt_cv_struct_utmp_host=yes],[rxvt_cv_struct_utmp_host=no])])
694[struct utmp ut; ut.ut_host;],
695rxvt_cv_struct_utmp_host=yes, rxvt_cv_struct_utmp_host=no)])
696if test x$rxvt_cv_struct_utmp_host = xyes; then 761if test x$rxvt_cv_struct_utmp_host = xyes; then
697 AC_DEFINE(HAVE_UTMP_HOST, 1, Define if struct utmp contains ut_host) 762 AC_DEFINE(HAVE_UTMP_HOST, 1, Define if struct utmp contains ut_host)
698fi 763fi
699 764
700AC_CACHE_CHECK(for ut_pid in utmp struct, rxvt_cv_struct_utmp_pid, 765AC_CACHE_CHECK(for ut_pid in utmp struct, rxvt_cv_struct_utmp_pid,
701[AC_TRY_COMPILE([#include <sys/types.h> 766[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
702#include <utmp.h>], 767#include <utmp.h>]], [[struct utmp ut; ut.ut_pid;]])],[rxvt_cv_struct_utmp_pid=yes],[rxvt_cv_struct_utmp_pid=no])])
703[struct utmp ut; ut.ut_pid;],
704rxvt_cv_struct_utmp_pid=yes, rxvt_cv_struct_utmp_pid=no)])
705if test x$rxvt_cv_struct_utmp_pid = xyes; then 768if test x$rxvt_cv_struct_utmp_pid = xyes; then
706 AC_DEFINE(HAVE_UTMP_PID, 1, Define if struct utmp contains ut_pid) 769 AC_DEFINE(HAVE_UTMP_PID, 1, Define if struct utmp contains ut_pid)
707fi 770fi
708) dnl# AC_CHECK_HEADER(utmp.h 771) dnl# AC_CHECK_HEADER(utmp.h
709 772
710dnl# -------------------------------------------- 773dnl# --------------------------------------------
711 774
712AC_CHECK_HEADER(utmpx.h, 775AC_CHECK_HEADER(utmpx.h,
713[AC_CACHE_CHECK([for struct utmpx], rxvt_cv_struct_utmpx, 776[AC_CACHE_CHECK([for struct utmpx], rxvt_cv_struct_utmpx,
777[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
778#include <utmpx.h>]], [[struct utmpx ut;]])],[rxvt_cv_struct_utmpx=yes],[rxvt_cv_struct_utmpx=no])])
779if test x$rxvt_cv_struct_utmpx = xyes; then
780 AC_DEFINE(HAVE_STRUCT_UTMPX, 1, Define if utmpx.h has struct utmpx)
781fi
782]
783
784AC_CACHE_CHECK(for host in utmpx struct, rxvt_cv_struct_utmpx_host,
785[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
786#include <utmpx.h>]], [[struct utmpx utx; utx.ut_host;]])],[rxvt_cv_struct_utmpx_host=yes],[rxvt_cv_struct_utmpx_host=no])])
787if test x$rxvt_cv_struct_utmpx_host = xyes; then
788 AC_DEFINE(HAVE_UTMPX_HOST, 1, Define if struct utmpx contains ut_host)
789fi
790
791AC_CACHE_CHECK(for session in utmpx struct, rxvt_cv_struct_utmpx_session,
714[AC_TRY_COMPILE([#include <sys/types.h> 792[AC_TRY_COMPILE([#include <sys/types.h>
715#include <utmpx.h>], 793#include <utmpx.h>],
716[struct utmpx ut;], 794[struct utmpx utx; utx.ut_session;],
717rxvt_cv_struct_utmpx=yes, rxvt_cv_struct_utmpx=no)]) 795rxvt_cv_struct_utmpx_session=yes, rxvt_cv_struct_utmpx_session=no)])
718if test x$rxvt_cv_struct_utmpx = xyes; then 796if test x$rxvt_cv_struct_utmpx_session = xyes; then
719 AC_DEFINE(HAVE_STRUCT_UTMPX, 1, Define if utmpx.h has struct utmpx)
720fi
721]
722
723AC_CACHE_CHECK(for host in utmpx struct, rxvt_cv_struct_utmpx_host,
724[AC_TRY_COMPILE([#include <sys/types.h>
725#include <utmpx.h>],
726[struct utmpx utx; utx.ut_host;],
727rxvt_cv_struct_utmpx_host=yes, rxvt_cv_struct_utmpx_host=no)])
728if test x$rxvt_cv_struct_utmpx_host = xyes; then
729 AC_DEFINE(HAVE_UTMPX_HOST, 1, Define if struct utmpx contains ut_host) 797 AC_DEFINE(HAVE_UTMPX_SESSION, 1, Define if struct utmpx contains ut_session)
730fi 798fi
731) dnl# AC_CHECK_HEADER(utmpx.h 799) dnl# AC_CHECK_HEADER(utmpx.h
732
733 800
734dnl# -------------------------------------------------------------------------- 801dnl# --------------------------------------------------------------------------
735dnl# check for struct lastlog 802dnl# check for struct lastlog
736AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog, 803AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog,
737[AC_TRY_COMPILE([#include <sys/types.h> 804[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
738#include <utmp.h> 805#include <utmp.h>
739#ifdef HAVE_LASTLOG_H 806#ifdef HAVE_LASTLOG_H
740#include <lastlog.h> 807#include <lastlog.h>
741#endif 808#endif
742],
743[struct lastlog ll;],
744rxvt_cv_struct_lastlog=yes, rxvt_cv_struct_lastlog=no)]) 809]], [[struct lastlog ll;]])],[rxvt_cv_struct_lastlog=yes],[rxvt_cv_struct_lastlog=no])])
745if test x$rxvt_cv_struct_lastlog = xyes; then 810if test x$rxvt_cv_struct_lastlog = xyes; then
746 AC_DEFINE(HAVE_STRUCT_LASTLOG, 1, Define if utmp.h or lastlog.h has struct lastlog) 811 AC_DEFINE(HAVE_STRUCT_LASTLOG, 1, Define if utmp.h or lastlog.h has struct lastlog)
747fi 812fi
748 813
749dnl# check for struct lastlogx 814dnl# check for struct lastlogx
750AC_CACHE_CHECK(for struct lastlogx, rxvt_cv_struct_lastlogx, 815AC_CACHE_CHECK(for struct lastlogx, rxvt_cv_struct_lastlogx,
751[AC_TRY_COMPILE([#include <sys/types.h> 816[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
752#include <utmpx.h> 817#include <utmpx.h>
753#ifdef HAVE_LASTLOG_H 818#ifdef HAVE_LASTLOG_H
754#include <lastlog.h> 819#include <lastlog.h>
755#endif 820#endif
756],
757[struct lastlogx ll;],
758rxvt_cv_struct_lastlogx=yes, rxvt_cv_struct_lastlogx=no)]) 821]], [[struct lastlogx ll;]])],[rxvt_cv_struct_lastlogx=yes],[rxvt_cv_struct_lastlogx=no])])
759if test x$rxvt_cv_struct_lastlogx = xyes; then 822if test x$rxvt_cv_struct_lastlogx = xyes; then
760 AC_DEFINE(HAVE_STRUCT_LASTLOGX, 1, Define if utmpx.h or lastlog.h has struct lastlogx) 823 AC_DEFINE(HAVE_STRUCT_LASTLOGX, 1, Define if utmpx.h or lastlog.h has struct lastlogx)
761fi 824fi
762 825
763dnl# -------------------------------------------------------------------------- 826dnl# --------------------------------------------------------------------------
764dnl# FIND FILES 827dnl# FIND FILES
765dnl# -------------------------------------------------------------------------- 828dnl# --------------------------------------------------------------------------
766 829
767dnl# find utmp 830dnl# find utmp
768AC_CACHE_CHECK(where utmp is located, rxvt_cv_path_utmp, 831AC_CACHE_CHECK(where utmp is located, rxvt_cv_path_utmp,
769[AC_TRY_RUN([#include <stdio.h> 832[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
770#include <sys/types.h> 833#include <sys/types.h>
771#include <utmp.h> 834#include <utmp.h>
772#include <errno.h> 835#include <errno.h>
773main() 836main()
774{ 837{
… …
789 fprintf(f, "%s\n", *u); 852 fprintf(f, "%s\n", *u);
790 exit(0); 853 exit(0);
791 } 854 }
792 } 855 }
793 exit(0); 856 exit(0);
794}], rxvt_cv_path_utmp=`cat conftestval`, rxvt_cv_path_utmp=, dnl 857}]])],[rxvt_cv_path_utmp=`cat conftestval`],[rxvt_cv_path_utmp=],[dnl
795 AC_MSG_WARN([Define RXVT_UTMP_FILE in config.h manually]))]) 858 AC_MSG_WARN(Define RXVT_UTMP_FILE in config.h manually)])])
796if test x$rxvt_cv_path_utmp != x; then 859if test x$rxvt_cv_path_utmp != x; then
797 AC_DEFINE_UNQUOTED(RXVT_UTMP_FILE, "$rxvt_cv_path_utmp", Define location of utmp) 860 AC_DEFINE_UNQUOTED(RXVT_UTMP_FILE, "$rxvt_cv_path_utmp", Define location of utmp)
798fi 861fi
799 862
800dnl# -------------------------------------------------------------------------- 863dnl# --------------------------------------------------------------------------
801 864
802dnl# find utmpx - if a utmp file exists at the same location and is more than 865dnl# find utmpx - if a utmp file exists at the same location and is more than
803dnl# a day newer, then dump the utmpx. People leave lots of junk around. 866dnl# a day newer, then dump the utmpx. People leave lots of junk around.
804AC_CACHE_CHECK(where utmpx is located, rxvt_cv_path_utmpx, 867AC_CACHE_CHECK(where utmpx is located, rxvt_cv_path_utmpx,
805[AC_TRY_RUN([#include <stdio.h> 868[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
806#include <sys/types.h> 869#include <sys/types.h>
807#include <utmpx.h> 870#include <utmpx.h>
808#include <errno.h> 871#include <errno.h>
809#include <sys/stat.h> 872#include <sys/stat.h>
810#ifdef HAVE_STRING_H 873#ifdef HAVE_STRING_H
… …
835 fprintf(f, "%s\n", *u); 898 fprintf(f, "%s\n", *u);
836 exit(0); 899 exit(0);
837 } 900 }
838 } 901 }
839 exit(0); 902 exit(0);
840}], rxvt_cv_path_utmpx=`cat conftestval`, rxvt_cv_path_utmpx=, dnl 903}]])],[rxvt_cv_path_utmpx=`cat conftestval`],[rxvt_cv_path_utmpx=],[dnl
841 AC_MSG_WARN([Define RXVT_UTMPX_FILE in config.h manually]))]) 904 AC_MSG_WARN(Define RXVT_UTMPX_FILE in config.h manually)])])
842if test x$rxvt_cv_path_utmpx != x; then 905if test x$rxvt_cv_path_utmpx != x; then
843 AC_DEFINE_UNQUOTED(RXVT_UTMPX_FILE, "$rxvt_cv_path_utmpx", Define location of utmpx) 906 AC_DEFINE_UNQUOTED(RXVT_UTMPX_FILE, "$rxvt_cv_path_utmpx", Define location of utmpx)
844fi 907fi
845 908
846dnl# -------------------------------------------------------------------------- 909dnl# --------------------------------------------------------------------------
847 910
848dnl# find wtmp 911dnl# find wtmp
849AC_CACHE_CHECK(where wtmp is located, rxvt_cv_path_wtmp, 912AC_CACHE_CHECK(where wtmp is located, rxvt_cv_path_wtmp,
850[AC_TRY_RUN([#include <stdio.h> 913[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
851#include <sys/types.h> 914#include <sys/types.h>
852#ifdef HAVE_UTMP_H 915#ifdef HAVE_UTMP_H
853#include <utmp.h> 916#include <utmp.h>
854#endif 917#endif
855#include <errno.h> 918#include <errno.h>
… …
872 fprintf(f, "%s\n", *w); 935 fprintf(f, "%s\n", *w);
873 exit(0); 936 exit(0);
874 } 937 }
875 } 938 }
876 exit(0); 939 exit(0);
877}], rxvt_cv_path_wtmp=`cat conftestval`, rxvt_cv_path_wtmp=, dnl 940}]])],[rxvt_cv_path_wtmp=`cat conftestval`],[rxvt_cv_path_wtmp=],[dnl
878 AC_MSG_WARN([Define RXVT_WTMP_FILE in config.h manually]))]) 941 AC_MSG_WARN(Define RXVT_WTMP_FILE in config.h manually)])])
879if test x$rxvt_cv_path_wtmp != x; then 942if test x$rxvt_cv_path_wtmp != x; then
880 AC_DEFINE_UNQUOTED(RXVT_WTMP_FILE, "$rxvt_cv_path_wtmp", Define location of wtmp) 943 AC_DEFINE_UNQUOTED(RXVT_WTMP_FILE, "$rxvt_cv_path_wtmp", Define location of wtmp)
881fi 944fi
882dnl# -------------------------------------------------------------------------- 945dnl# --------------------------------------------------------------------------
883 946
884dnl# find wtmpx 947dnl# find wtmpx
885AC_CACHE_CHECK(where wtmpx is located, rxvt_cv_path_wtmpx, 948AC_CACHE_CHECK(where wtmpx is located, rxvt_cv_path_wtmpx,
886[AC_TRY_RUN([#include <stdio.h> 949[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
887#ifdef HAVE_UTMPX_H 950#ifdef HAVE_UTMPX_H
888#include <utmpx.h> 951#include <utmpx.h>
889#endif 952#endif
890#include <errno.h> 953#include <errno.h>
891main() 954main()
… …
907 fprintf(f, "%s\n", *w); 970 fprintf(f, "%s\n", *w);
908 exit(0); 971 exit(0);
909 } 972 }
910 } 973 }
911 exit(0); 974 exit(0);
912}], rxvt_cv_path_wtmpx=`cat conftestval`, rxvt_cv_path_wtmpx=, dnl 975}]])],[rxvt_cv_path_wtmpx=`cat conftestval`],[rxvt_cv_path_wtmpx=],[dnl
913 AC_MSG_WARN([Define RXVT_WTMPX_FILE in config.h manually]))]) 976 AC_MSG_WARN(Define RXVT_WTMPX_FILE in config.h manually)])])
914if test x$rxvt_cv_path_wtmpx != x; then 977if test x$rxvt_cv_path_wtmpx != x; then
915 AC_DEFINE_UNQUOTED(RXVT_WTMPX_FILE, "$rxvt_cv_path_wtmpx", Define location of wtmpx) 978 AC_DEFINE_UNQUOTED(RXVT_WTMPX_FILE, "$rxvt_cv_path_wtmpx", Define location of wtmpx)
916fi 979fi
917dnl# -------------------------------------------------------------------------- 980dnl# --------------------------------------------------------------------------
918 981
919dnl# find lastlog 982dnl# find lastlog
920AC_CACHE_CHECK(where lastlog is located, rxvt_cv_path_lastlog, 983AC_CACHE_CHECK(where lastlog is located, rxvt_cv_path_lastlog,
921[AC_TRY_RUN([#include <stdio.h> 984[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
922#include <sys/types.h> 985#include <sys/types.h>
923#ifdef HAVE_UTMPX_H 986#ifdef HAVE_UTMPX_H
924#include <utmpx.h> 987#include <utmpx.h>
925#elif defined(HAVE_UTMP_H) 988#elif defined(HAVE_UTMP_H)
926#include <utmp.h> 989#include <utmp.h>
… …
947 fprintf(f, "%s\n", *w); 1010 fprintf(f, "%s\n", *w);
948 exit(0); 1011 exit(0);
949 } 1012 }
950 } 1013 }
951 exit(0); 1014 exit(0);
952}], rxvt_cv_path_lastlog=`cat conftestval`, rxvt_cv_path_lastlog=, dnl 1015}]])],[rxvt_cv_path_lastlog=`cat conftestval`],[rxvt_cv_path_lastlog=],[dnl
953 AC_MSG_WARN([Define RXVT_LASTLOG_FILE in config.h manually]))]) 1016 AC_MSG_WARN(Define RXVT_LASTLOG_FILE in config.h manually)])])
954if test x$rxvt_cv_path_lastlog != x; then 1017if test x$rxvt_cv_path_lastlog != x; then
955 AC_DEFINE_UNQUOTED(RXVT_LASTLOG_FILE, "$rxvt_cv_path_lastlog", Define location of lastlog) 1018 AC_DEFINE_UNQUOTED(RXVT_LASTLOG_FILE, "$rxvt_cv_path_lastlog", Define location of lastlog)
956 if test -d "$rxvt_cv_path_lastlog"; then 1019 if test -d "$rxvt_cv_path_lastlog"; then
957 AC_DEFINE(LASTLOG_IS_DIR, 1, Define if lastlog is provided via a directory) 1020 AC_DEFINE(LASTLOG_IS_DIR, 1, Define if lastlog is provided via a directory)
958 fi 1021 fi
959fi 1022fi
960dnl# -------------------------------------------------------------------------- 1023dnl# --------------------------------------------------------------------------
961 1024
962dnl# find lastlogx 1025dnl# find lastlogx
963AC_CACHE_CHECK(where lastlogx is located, rxvt_cv_path_lastlogx, 1026AC_CACHE_CHECK(where lastlogx is located, rxvt_cv_path_lastlogx,
964[AC_TRY_RUN([#include <stdio.h> 1027[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
965#ifdef HAVE_UTMPX_H 1028#ifdef HAVE_UTMPX_H
966#include <utmpx.h> 1029#include <utmpx.h>
967#endif 1030#endif
968#include <errno.h> 1031#include <errno.h>
969main() 1032main()
… …
984 fprintf(f, "%s\n", *w); 1047 fprintf(f, "%s\n", *w);
985 exit(0); 1048 exit(0);
986 } 1049 }
987 } 1050 }
988 exit(0); 1051 exit(0);
989}], rxvt_cv_path_lastlogx=`cat conftestval`, rxvt_cv_path_lastlogx=, dnl 1052}]])],[rxvt_cv_path_lastlogx=`cat conftestval`],[rxvt_cv_path_lastlogx=],[dnl
990 AC_MSG_WARN([Define RXVT_LASTLOGX_FILE in config.h manually]))]) 1053 AC_MSG_WARN(Define RXVT_LASTLOGX_FILE in config.h manually)])])
991if test x$rxvt_cv_path_lastlogx != x; then 1054if test x$rxvt_cv_path_lastlogx != x; then
992 AC_DEFINE_UNQUOTED(RXVT_LASTLOGX_FILE, "$rxvt_cv_path_lastlogx", Define location of lastlogx) 1055 AC_DEFINE_UNQUOTED(RXVT_LASTLOGX_FILE, "$rxvt_cv_path_lastlogx", Define location of lastlogx)
993fi 1056fi
994 1057
995dnl# -------------------------------------------------------------------------- 1058dnl# --------------------------------------------------------------------------
… …
1019LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 1082LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
1020if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then 1083if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
1021 LIBS=`echo $LIBS | sed "$R_TRANSLATE"` 1084 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
1022fi 1085fi
1023AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 1086AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
1024[AC_TRY_RUN([#include <X11/Xlib.h> 1087[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
1025main() { 1088main() {
1026char *p; 1089char *p;
1027if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 1090if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
1028exit (XSupportsLocale() ? 0 : 1); 1091exit (XSupportsLocale() ? 0 : 1);
1029else 1092else
1030exit (1);}], dnl 1093exit (1);}]])],[dnl
1031 rxvt_cv_func_xlocale=yes, rxvt_cv_func_xlocale=no, dnl 1094 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
1032 AC_MSG_WARN([Define NO_XLOCALE in config.h manually]))]) 1095 AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])])
1033if test x$rxvt_cv_func_xlocale = xyes; then 1096if test x$rxvt_cv_func_xlocale = xyes; then
1034 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works) 1097 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works)
1035fi 1098fi
1036 1099
1037AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, 1100AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
1038[AC_TRY_LINK([#define X_LOCALE 1 1101[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
1039#include <X11/Xlocale.h>], 1102#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
1040 [setlocale(LC_CTYPE, "");],
1041 rxvt_cv_func_xsetlocale=yes, rxvt_cv_func_xsetlocale=no)])
1042if test x$rxvt_cv_func_xsetlocale = xyes; then 1103if test x$rxvt_cv_func_xsetlocale = xyes; then
1043 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 1104 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
1044fi 1105fi
1045LIBS=$ac_save_LIBS 1106LIBS=$ac_save_LIBS
1046CFLAGS=$ac_save_CFLAGS 1107CFLAGS=$ac_save_CFLAGS
1047 1108
1048AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale, 1109AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
1049[AC_TRY_LINK([#include <clocale>], 1110[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])
1050 [setlocale(LC_CTYPE, "");],
1051 rxvt_cv_func_setlocale=yes, rxvt_cv_func_setlocale=no)])
1052if test x$rxvt_cv_func_setlocale = xyes; then 1111if test x$rxvt_cv_func_setlocale = xyes; then
1053 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works) 1112 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
1054fi 1113fi
1055 1114
1056AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo, 1115AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,
1057[AC_TRY_LINK([#include <langinfo.h>], 1116[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])])
1058 [nl_langinfo(CODESET);],
1059 rxvt_cv_func_nl_langinfo=yes, rxvt_cv_func_nl_langinfo=no)])
1060if test x$rxvt_cv_func_nl_langinfo = xyes; then 1117if test x$rxvt_cv_func_nl_langinfo = xyes; then
1061 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) 1118 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
1062fi 1119fi
1063 1120
1121AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
1122[AC_COMPILE_IFELSE([
1123#include <X11/Xlib.h>
1124
1125void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
1126
1127void f() {
1128 XIMCallback cb;
1129 cb.callback = im_destroy_cb;
1130}
1131],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)])
1132
1133if test x$rxvt_broken_ximcb = xyes; then
1134 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
1135fi
1136
1064AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt, 1137AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt,
1065[AC_TRY_LINK([#define _GNU_SOURCE 1138[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define _GNU_SOURCE
1066#ifdef HAVE_STDLIB_H 1139#ifdef HAVE_STDLIB_H
1067# include <cstdlib> 1140# include <cstdlib>
1068#endif], 1141#endif]], [[(void)getpt();]])],[rxvt_cv_func_getpt=yes],[rxvt_cv_func_getpt=no])])
1069 [(void)getpt();],
1070 rxvt_cv_func_getpt=yes, rxvt_cv_func_getpt=no)])
1071if test x$rxvt_cv_func_getpt = xyes; then 1142if test x$rxvt_cv_func_getpt = xyes; then
1072 AC_DEFINE(HAVE_GETPT, 1, Define if you have _GNU_SOURCE getpt() ) 1143 AC_DEFINE(HAVE_GETPT, 1, Define if you have _GNU_SOURCE getpt() )
1073fi 1144fi
1074 1145
1075dnl# if we don't guess right then it's up to the user 1146dnl# if we don't guess right then it's up to the user
… …
1133if test x$rxvt_cv_ptys = xBSD -o x$rxvt_cv_ptys = xHPUX -o x$rxvt_cv_ptys = xGLIBC; then 1204if test x$rxvt_cv_ptys = xBSD -o x$rxvt_cv_ptys = xHPUX -o x$rxvt_cv_ptys = xGLIBC; then
1134 AC_DEFINE(PTYS_ARE_SEARCHED, 1, Define for this pty type) 1205 AC_DEFINE(PTYS_ARE_SEARCHED, 1, Define for this pty type)
1135fi 1206fi
1136 1207
1137 1208
1138AC_CHECKING(for pty ranges) 1209AS_MESSAGE(checking for pty ranges...)
1139ptys=`echo /dev/pty??` 1210ptys=`echo /dev/pty??`
1140pch1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'` 1211pch1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'`
1141pch2=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'` 1212pch2=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'`
1142if test x$pch1 != x; then 1213if test x$pch1 != x; then
1143 AC_DEFINE_UNQUOTED(PTYCHAR1, "$pch1", Define for first char in devptyXX) 1214 AC_DEFINE_UNQUOTED(PTYCHAR1, "$pch1", Define for first char in devptyXX)
1144fi 1215fi
1145if test x$pch2 != x; then 1216if test x$pch2 != x; then
1146 AC_DEFINE_UNQUOTED(PTYCHAR2, "$pch2", Define for second char in devptyXX) 1217 AC_DEFINE_UNQUOTED(PTYCHAR2, "$pch2", Define for second char in devptyXX)
1147fi 1218fi
1148 1219
1149dnl# FreeBSD needs to link libxpg4
1150AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])
1151
1152dnl# -------------------------------------------------------------------------- 1220dnl# --------------------------------------------------------------------------
1153dnl# now add and remove other stuff 1221dnl# now add and remove other stuff
1154dnl# -------------------------------------------------------------------------- 1222dnl# --------------------------------------------------------------------------
1223if test x$support_xft = xyes; then
1224 LIBS="$LIBS `pkg-config xft --libs`"
1225 CFLAGS="$CFLAGS `pkg-config xft --cflags`"
1226 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
1227
1228 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
1229 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
1230
1231 if test x$support_xft = xyes; then
1232 AC_DEFINE(XFT, 1, Define to enable xft support)
1233 fi
1234fi
1235if test x$support_styles = xyes; then
1236 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
1237fi
1238if test x$support_iso14755 = xyes; then
1239 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
1240fi
1241if test x$support_8bitctrls = xyes; then
1242 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
1243fi
1244if test x$support_fading = xyes; then
1245 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
1246fi
1247if test x$support_tinting = xyes; then
1248 AC_DEFINE(TINTING, 1, Define if you want your background to be tinted)
1249fi
1155if test x$support_inheritpixmap = xyes; then 1250if test x$support_inheritpixmap = xyes; then
1156 AC_DEFINE(TRANSPARENT, 1, Define if you want your background to use the parent window background) 1251 AC_DEFINE(TRANSPARENT, 1, Define if you want your background to use the parent window background)
1157fi 1252fi
1158if test x$support_keepscrolling = xno; then 1253if test x$support_keepscrolling = xno; then
1159 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) 1254 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
… …
1162 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen) 1257 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)
1163fi 1258fi
1164if test x$support_menubar = xyes; then 1259if test x$support_menubar = xyes; then
1165 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support) 1260 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support)
1166fi 1261fi
1167if test x$support_frills = xno; then 1262if test x$support_frills = xyes; then
1168 AC_DEFINE(NO_FRILLS, 1, Define if you don't want handling for rarely used features) 1263 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
1169fi
1170if test x$support_linespace = xno; then
1171 AC_DEFINE(NO_LINESPACE, 1, Define if you don't want support linespace)
1172fi 1264fi
1173if test x$support_24bit = xyes; then 1265if test x$support_24bit = xyes; then
1174 AC_DEFINE(PREFER_24BIT, 1, Define to use a 24 bit visual if the screen has 24 bit mode, even if the default is 8 bit) 1266 AC_DEFINE(PREFER_24BIT, 1, Define to use a 24 bit visual if the screen has 24 bit mode, even if the default is 8 bit)
1175fi 1267fi
1176if test x$support_mousewheel = xyes; then 1268if test x$support_mousewheel = xyes; then
… …
1213 scrolltypes="$scrolltypes plain" 1305 scrolltypes="$scrolltypes plain"
1214fi 1306fi
1215if test x$support_pointer_blank = xyes; then 1307if test x$support_pointer_blank = xyes; then
1216 AC_DEFINE(POINTER_BLANK, 1, Define if you want hide the pointer while typing) 1308 AC_DEFINE(POINTER_BLANK, 1, Define if you want hide the pointer while typing)
1217fi 1309fi
1218if test x$support_cursor_blink = xyes; then
1219 AC_DEFINE(CURSOR_BLINK, 1, Define if you want blinking cursor support)
1220fi
1221if test x$support_text_blink = xyes; then 1310if test x$support_text_blink = xyes; then
1222 AC_DEFINE(TEXT_BLINK, 1, Define if you want blinking text support) 1311 AC_DEFINE(TEXT_BLINK, 1, Define if you want blinking text support)
1223fi 1312fi
1224if test x$support_unicode3 = xyes; then 1313if test x$support_unicode3 = xyes; then
1225 AC_DEFINE(UNICODE_3, 1, Define if you want to represent unicode characters outside plane 0) 1314 AC_DEFINE(UNICODE_3, 1, Define if you want to represent unicode characters outside plane 0)
1226fi 1315fi
1227if test x$support_combining = xyes; then 1316if test x$support_combining = xyes; then
1228 AC_DEFINE(ENABLE_COMBINING, 1, Define if you want to automatically compose combining characters) 1317 AC_DEFINE(ENABLE_COMBINING, 1, Define if you want to automatically compose combining characters)
1229fi 1318fi
1230if test x$codesets = xall; then 1319if test x$codesets = xall; then
1231 codesets=jp,jp-ext,kr,cn,cn-ext 1320 codesets=jp,jp-ext,kr,zh,zh-ext
1232fi 1321fi
1322AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
1323AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
1233for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do 1324for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do
1234 AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
1235 AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
1236 case "$codeset" in 1325 case "$codeset" in
1237 JP ) AC_DEFINE(ENCODING_JP, 1, Define if you want japanese codesets) ;; 1326 JP ) AC_DEFINE(ENCODING_JP, 1, Define if you want japanese codesets) ;;
1238 JP_EXT ) AC_DEFINE(ENCODING_JP_EXT, 1, Define if you want extended japanese codesets) ;; 1327 JP_EXT ) AC_DEFINE(ENCODING_JP_EXT, 1, Define if you want extended japanese codesets) ;;
1239 KR ) AC_DEFINE(ENCODING_KR, 1, Define if you want korean codesets) ;; 1328 KR ) AC_DEFINE(ENCODING_KR, 1, Define if you want korean codesets) ;;
1240 CN ) AC_DEFINE(ENCODING_CN, 1, Define if you want chinese codesets) ;; 1329 ZH ) AC_DEFINE(ENCODING_ZH, 1, Define if you want chinese codesets) ;;
1241 CN_EXT ) AC_DEFINE(ENCODING_CN_EXT, 1, Define if you want extended chinese codesets) ;; 1330 ZH_EXT ) AC_DEFINE(ENCODING_ZH_EXT, 1, Define if you want extended chinese codesets) ;;
1242 esac 1331 esac
1243done 1332done
1244 1333
1245dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket) 1334dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket)
1246 1335
… …
1301RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch) 1390RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch)
1302RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch) 1391RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
1303RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch) 1392RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)
1304RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes) 1393RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
1305 1394
1306if test x$support_xft = xyes; then
1307 LIBS="$LIBS `pkg-config xft --libs`"
1308 CFLAGS="$CFLAGS `pkg-config xft --cflags`"
1309 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
1310
1311 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
1312 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
1313
1314 if test x$support_xft = xyes; then
1315 AC_DEFINE(XFT, 1, Define to enable xft support)
1316 fi
1317fi
1318
1319AC_OUTPUT(autoconf/Make.common \ 1395AC_CONFIG_FILES([autoconf/Make.common \
1320Makefile \ 1396Makefile \
1321doc/Makefile \ 1397doc/Makefile \
1322src/Makefile \ 1398src/Makefile \
1323src/test/Makefile \
1324src/rxvtlib.h \ 1399src/rxvtlib.h \
1325W11/Makefile \ 1400])
1326) 1401AC_OUTPUT
1327 1402
1328echo "Configuration: 1403echo "Configuration:
1329 1404
1330 Rxvt version: $VERSION : $DATE 1405 Rxvt version: $VERSION : $DATE
1331 Source code location: $srcdir 1406 Source code location: $srcdir
… …
1399 echo ". functions could not be found. ." 1474 echo ". functions could not be found. ."
1400 echo ". XIM is now being DISABLED! ." 1475 echo ". XIM is now being DISABLED! ."
1401 echo ".----------------------------------------------------------------." 1476 echo ".----------------------------------------------------------------."
1402fi 1477fi
1403 1478
1404echo " *** Please check src/feature.h for further options ***" 1479echo " *** Optionally check src/feature.h for further options ***"
1405echo 1480echo
1406 1481
1407echo ".----------------------------------------------------------------." 1482echo ".----------------------------------------------------------------."
1408echo ". NOTE: most features are disabled by default, try ." 1483echo ". NOTE: most features are disabled by default, try ."
1409echo ". configure --help to get an idea of the optional features ." 1484echo ". configure --help to get an idea of the optional features, ."
1485echo ". or read ./README.configure ."
1486echo ". ."
1487echo ". The script ./reconf gives a reasonable baseline, try it if ."
1488echo ". you do not want to read documentation and still want some ."
1489echo ". useful features. ."
1410echo ".----------------------------------------------------------------." 1490echo ".----------------------------------------------------------------."
1411echo 1491echo
1412 1492

Diff Legend

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