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.52 by root, Fri Feb 18 12:15:07 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
61support_addstrings=no 91support_addstrings=no
62support_frills=no 92support_frills=no
63support_linespace=no
64support_inheritpixmap=no 93support_inheritpixmap=no
94support_tinting=no
95support_fading=no
65support_keepscrolling=no 96support_keepscrolling=no
66support_selectionscrolling=no 97support_selectionscrolling=no
67support_menubar=no 98support_menubar=no
68support_mousewheel=no 99support_mousewheel=no
69support_mouseslipwheel=no 100support_mouseslipwheel=no
… …
80support_xim=no 111support_xim=no
81support_xpm=no 112support_xpm=no
82support_xft=no 113support_xft=no
83support_unicode3=no 114support_unicode3=no
84support_combining=no 115support_combining=no
116support_8bitctrls=no
117support_iso14755=no
118support_styles=no
85codesets= 119codesets=
86 120
87dnl# -------------------------------------------------------------------------- 121dnl# --------------------------------------------------------------------------
88dnl# CHECKING COMMAND LINE OPTIONS 122dnl# CHECKING COMMAND LINE OPTIONS
89dnl# -------------------------------------------------------------------------- 123dnl# --------------------------------------------------------------------------
… …
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],
101 [if test x$enableval = xyes; then 135 [if test x$enableval = xyes; then
102 support_24bit=yes 136 support_24bit=yes
103 support_frills=yes 137 support_frills=yes
104 support_linespace=yes
105 support_inheritpixmap=yes 138 support_inheritpixmap=yes
139 support_tinting=yes
140 support_fading=yes
106 support_keepscrolling=yes 141 support_keepscrolling=yes
107 support_selectionscrolling=yes 142 support_selectionscrolling=yes
108 support_lastlog=yes 143 support_lastlog=yes
109 support_menubar=yes 144 support_menubar=yes
110 support_mousewheel=yes 145 support_mousewheel=yes
… …
121 support_xim=yes 156 support_xim=yes
122 support_xpm=yes 157 support_xpm=yes
123 support_xft=yes 158 support_xft=yes
124 support_unicode3=yes 159 support_unicode3=yes
125 support_combining=yes 160 support_combining=yes
161 #support_8bitctrls=yes
162 support_iso14755=yes
163 support_styles=yes
126 codesets=all 164 codesets=all
127 fi]) 165 fi])
128 166
129AC_ARG_ENABLE(unicode3, 167AC_ARG_ENABLE(unicode3,
130 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters], 168 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters],
131 [if test x$enableval = xyes -o x$enableval = xno; then 169 [if test x$enableval = xyes -o x$enableval = xno; then
132 support_unicode3=yes 170 support_unicode3=$enableval
133 fi]) 171 fi])
134 172
135AC_ARG_ENABLE(combining, 173AC_ARG_ENABLE(combining,
136 [ --enable-combining enable composition of base and combining characters], 174 [ --enable-combining enable composition of base and combining characters],
137 [if test x$enableval = xyes -o x$enableval = xno; then 175 [if test x$enableval = xyes -o x$enableval = xno; then
138 support_combining=yes 176 support_combining=$enableval
139 fi]) 177 fi])
140 178
141AC_ARG_ENABLE(xft, 179AC_ARG_ENABLE(xft,
142 [ --enable-xft enable xft support on systems that have it], 180 [ --enable-xft enable xft support on systems that have it],
143 [if test x$enableval = xyes -o x$enableval = xno; then 181 [if test x$enableval = xyes -o x$enableval = xno; then
144 support_xft=yes 182 support_xft=$enableval
183 fi])
184
185AC_ARG_ENABLE(font-styles,
186 [ --enable-font-styles enable bold and italic support],
187 [if test x$enableval = xyes -o x$enableval = xno; then
188 support_styles=$enableval
145 fi]) 189 fi])
146 190
147AC_ARG_ENABLE(utmp, 191AC_ARG_ENABLE(utmp,
148 [ --enable-utmp enable utmp (utmpx) support], 192 [ --enable-utmp enable utmp (utmpx) support],
149 [if test x$enableval = xyes -o x$enableval = xno; then 193 [if test x$enableval = xyes -o x$enableval = xno; then
… …
170 214
171AC_ARG_ENABLE(transparency, 215AC_ARG_ENABLE(transparency,
172 [ --enable-transparency enable transparent backgrounds], 216 [ --enable-transparency enable transparent backgrounds],
173 [if test x$enableval = xyes -o x$enableval = xno; then 217 [if test x$enableval = xyes -o x$enableval = xno; then
174 support_inheritpixmap=$enableval 218 support_inheritpixmap=$enableval
219 fi])
220
221AC_ARG_ENABLE(tinting,
222 [ --enable-tinting enable tinting of transparent bg],
223 [if test x$enableval = xyes -o x$enableval = xno; then
224 support_tinting=$enableval
225 fi])
226
227AC_ARG_ENABLE(fading,
228 [ --enable-fading enable colors fading when off focus],
229 [if test x$enableval = xyes -o x$enableval = xno; then
230 support_fading=$enableval
175 fi]) 231 fi])
176 232
177AC_ARG_ENABLE(menubar, 233AC_ARG_ENABLE(menubar,
178 [ --enable-menubar enable menubar], 234 [ --enable-menubar enable menubar],
179 [if test x$enableval = xyes -o x$enableval = xno; then 235 [if test x$enableval = xyes -o x$enableval = xno; then
… …
209 [if test x$enableval = xyes; then 265 [if test x$enableval = xyes; then
210 AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less) 266 AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less)
211 fi]) 267 fi])
212 268
213AC_ARG_WITH(codesets, 269AC_ARG_WITH(codesets,
214 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,cn,cn_ext,all)], 270 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
215 [codesets="$withval"]) 271 [codesets="$withval"])
216 272
217AC_ARG_ENABLE(xim, 273AC_ARG_ENABLE(xim,
218 [ --enable-xim XIM (X Input Method) protocol support], 274 [ --enable-xim XIM (X Input Method) protocol support],
219 [if test x$enableval = xyes -o x$enableval = xno; then 275 [if test x$enableval = xyes -o x$enableval = xno; then
… …
246 302
247AC_ARG_ENABLE(xgetdefault, 303AC_ARG_ENABLE(xgetdefault,
248 [ --enable-xgetdefault enable resources via X instead of our small version], 304 [ --enable-xgetdefault enable resources via X instead of our small version],
249 [if test x$enableval = xyes; then 305 [if test x$enableval = xyes; then
250 AC_DEFINE(USE_XGETDEFAULT, 1, Define if you want to use XGetDefault instead of our internal version) 306 AC_DEFINE(USE_XGETDEFAULT, 1, Define if you want to use XGetDefault instead of our internal version)
307 fi])
308
309AC_ARG_ENABLE(8bitctrls,
310 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)],
311 [if test x$enableval = xyes -o x$enableval = xno; then
312 support_8bitctrls=$enableval
251 fi]) 313 fi])
252 314
253RESFALLBACK=Rxvt 315RESFALLBACK=Rxvt
254AC_ARG_ENABLE(fallback, 316AC_ARG_ENABLE(fallback,
255 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)], 317 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)],
… …
277 339
278RXVTNAME=urxvt 340RXVTNAME=urxvt
279AC_ARG_WITH(name, 341AC_ARG_WITH(name,
280 [ --with-name=NAME set the basename for the installed binaries (default: urxvt)], 342 [ --with-name=NAME set the basename for the installed binaries (default: urxvt)],
281 [RXVTNAME="$withval"]) 343 [RXVTNAME="$withval"])
344AC_DEFINE_UNQUOTED(RXVTNAME,"$RXVTNAME", [Binary base name])
282 345
283RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"` 346RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"`
284AC_SUBST(RXVTNAME) 347AC_SUBST(RXVTNAME)
285 348
286AC_ARG_ENABLE(strings, 349AC_ARG_ENABLE(strings,
… …
293 [ --disable-swapscreen disable swap screen support], 356 [ --disable-swapscreen disable swap screen support],
294 [if test x$enableval = xno; then 357 [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) 358 AC_DEFINE(NO_SECONDARY_SCREEN, 1, Disable the secondary screen. Many programs use the secondary screen as their workplace)
296 fi]) 359 fi])
297 360
361AC_ARG_ENABLE(iso14755,
362 [ --enable-iso14755 enable support for extended ISO 14755 modes],
363 [if test x$enableval = xyes -o x$enableval = xno; then
364 support_iso14755=$enableval
365 fi])
366
298AC_ARG_ENABLE(frills, 367AC_ARG_ENABLE(frills,
299 [ --enable-frills enable support for rarely used features], 368 [ --enable-frills enable support for rarely used features],
300 [if test x$enableval = xyes -o x$enableval = xno; then 369 [if test x$enableval = xyes -o x$enableval = xno; then
301 support_frills=$enableval 370 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]) 371 fi])
309 372
310AC_ARG_ENABLE(24bit, 373AC_ARG_ENABLE(24bit,
311 [ --enable-24bit enable support for using 24bit visuals if available], 374 [ --enable-24bit enable support for using 24bit visuals if available],
312 [if test x$enableval = xyes -o x$enableval = xno; then 375 [if test x$enableval = xyes -o x$enableval = xno; then
… …
360 [ --enable-smart-resize enable smart growth/shrink behaviour], 423 [ --enable-smart-resize enable smart growth/shrink behaviour],
361 [if test x$enableval = xyes; then 424 [if test x$enableval = xyes; then
362 AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior) 425 AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior)
363 fi]) 426 fi])
364 427
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, 428AC_ARG_ENABLE(cursor-blink,
372 [ --enable-cursor-blink enable blinking cursor], 429 [ --enable-cursor-blink enable blinking cursor],
373 [if test x$enableval = xyes -o x$enableval = xno; then 430 [if test x$enableval = xyes -o x$enableval = xno; then
374 support_cursor_blink=$enableval 431 support_cursor_blink=$enableval
375 fi]) 432 fi])
… …
399 fi]) 456 fi])
400 457
401dnl# -------------------------------------------------------------------------- 458dnl# --------------------------------------------------------------------------
402 459
403AC_DEFINE(PROTOTYPES, 1, Define if you need function prototypes) 460AC_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 461
420AC_PATH_PROG(MV, mv, mv) 462AC_PATH_PROG(MV, mv, mv)
421AC_PATH_PROG(RM, rm, rm) 463AC_PATH_PROG(RM, rm, rm)
422AC_PATH_PROG(CP, cp, cp) 464AC_PATH_PROG(CP, cp, cp)
423AC_PATH_PROG(LN, ln, ln) 465AC_PATH_PROG(LN, ln, ln)
424AC_PATH_PROG(SED, sed, sed) 466AC_PATH_PROG(SED, sed, sed)
425AC_PATH_PROG(ECHO, echo, echo) 467AC_PATH_PROG(ECHO, echo, echo)
426AC_PATH_PROG(CMP, cmp, cmp) 468AC_PATH_PROG(CMP, cmp, cmp)
427AC_PATH_PROG(TBL, tbl) 469AC_PATH_PROG(TBL, tbl)
470AC_PATH_PROG(TIC, tic)
428 471
429dnl# need a neat way to detect SVR4 or its features 472dnl# need a neat way to detect SVR4 or its features
430dnl# in src/command.c we use these functions: 473dnl# in src/command.c we use these functions:
431dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> 474dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
432dnl# - but are these also defined for other systems? 475dnl# - but are these also defined for other systems?
… …
469 sys/byteorder.h \ 512 sys/byteorder.h \
470 sys/ioctl.h \ 513 sys/ioctl.h \
471 sys/select.h \ 514 sys/select.h \
472 sys/sockio.h \ 515 sys/sockio.h \
473 sys/strredir.h \ 516 sys/strredir.h \
517 sys/stropts.h \
474 sys/time.h \ 518 sys/time.h \
475 utmp.h \ 519 utmp.h \
476 utmpx.h \ 520 utmpx.h \
477 stdint.h \ 521 stdint.h \
522 pty.h \
523 wchar.h \
524 cwchar \
525 clocale \
478) 526)
479 527
480AC_HEADER_TIME 528AC_HEADER_TIME
481 529
482dnl# check to allow both <termios.h> and <sys/ioctl.h> 530dnl# 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, 531AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
484[AC_TRY_COMPILE([#include <stdio.h> 532[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
485#include <sys/ioctl.h> 533#include <sys/ioctl.h>
486#ifdef HAVE_TERMIOS_H 534#ifdef HAVE_TERMIOS_H
487#include <termios.h> 535#include <termios.h>
488#endif], [int a = ECHO;], rxvt_cv_header_sysioctl=yes, rxvt_cv_header_sysioctl=no)]) 536#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
489 537
490dnl# ELF systems may want to store paths for dynamic libraries. 538dnl# ELF systems may want to store paths for dynamic libraries.
491dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath" 539dnl# 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. 540dnl# At least one version of SunOS wants "-R path" but it's not checked yet.
493if test -n "$GCC"; then 541if test -n "$GCC"; then
… …
502ac_save_CFLAGS=$CFLAGS 550ac_save_CFLAGS=$CFLAGS
503ac_save_LIBS=$LIBS 551ac_save_LIBS=$LIBS
504CFLAGS="$CFLAGS $X_CFLAGS" 552CFLAGS="$CFLAGS $X_CFLAGS"
505LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` 553LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
506AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath, 554AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath,
507[AC_TRY_RUN([ 555[AC_RUN_IFELSE([AC_LANG_SOURCE([[
508main() 556main()
509{ 557{
510 exit(0); 558 exit(0);
511 (void) XOpenDisplay("foobar"); 559 (void) XOpenDisplay("foobar");
512}], rxvt_cv_rpath=yes, rxvt_cv_rpath=no, dnl 560}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
513 AC_MSG_WARN([You may need to check the LIBS line]))]) 561 AC_MSG_WARN(You may need to check the LIBS line)])])
514if test x$rxvt_cv_rpath != xyes; then 562if test x$rxvt_cv_rpath != xyes; then
515 changequote(, )dnl 563 changequote(, )dnl
516 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g' 564 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
517 changequote([, ])dnl 565 changequote([, ])dnl
518 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` 566 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, 567 AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R,
520[AC_TRY_RUN([ 568[AC_RUN_IFELSE([AC_LANG_SOURCE([[
521main() 569main()
522{ 570{
523 exit(0); 571 exit(0);
524 (void) XOpenDisplay("foobar"); 572 (void) XOpenDisplay("foobar");
525}], rxvt_cv_R=yes, rxvt_cv_R=no, rxvt_cv_R=no)]) 573}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])
526 if test x$rxvt_cv_R != xyes; then 574 if test x$rxvt_cv_R != xyes; then
527 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 575 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
528 fi 576 fi
529fi 577fi
530 578
531AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 579AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
532[AC_TRY_COMPILE([#include <X11/Xlib.h>], [XPointer dummy;], 580[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 581if test x$rxvt_cv_xpointer = xyes; then
535 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 582 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
536fi 583fi
537LIBS=$ac_save_LIBS 584LIBS=$ac_save_LIBS
538CFLAGS=$ac_save_CFLAGS 585CFLAGS=$ac_save_CFLAGS
… …
551dnl> AC_CHECK_TYPE(umode_t, int) 598dnl> AC_CHECK_TYPE(umode_t, int)
552dnl> AC_CHECK_TYPE(off_t, long) 599dnl> AC_CHECK_TYPE(off_t, long)
553AC_TYPE_PID_T 600AC_TYPE_PID_T
554AC_TYPE_UID_T 601AC_TYPE_UID_T
555 602
556
557AC_CHECK_SIZEOF(char, 1)
558AC_CHECK_SIZEOF(short, 2) 603AC_CHECK_SIZEOF(short, 2)
559AC_CHECK_SIZEOF(int, 4) 604AC_CHECK_SIZEOF(int, 4)
560AC_CHECK_SIZEOF(long, 4) 605dnl AC_CHECK_SIZEOF(long, 4)
561AC_CHECK_SIZEOF(long long, 8) 606AC_CHECK_SIZEOF(long long, 8)
562AC_CHECK_SIZEOF(int *, 4) 607AC_CHECK_SIZEOF(int *, 4)
563 608
564dnl# see usage below 609dnl# see usage below
565AC_DEFUN(RXVT_CHECK_SIZE, 610AC_DEFUN(RXVT_CHECK_SIZE,
566 [AC_CACHE_CHECK([for $2], $1, 611 [AC_CACHE_CHECK([for $2], $1,
567 [AC_TRY_COMPILE([#include <stdint.h>], $2 dummy;, 612 [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 613if test "$ac_cv_sizeof_char" -ge $3; then
571 $1="$4 char" 614 $1="$4 char"
572else 615else
573 if test $ac_cv_sizeof_short -ge $3; then 616 if test "$ac_cv_sizeof_short" -ge $3; then
574 $1="$4 short" 617 $1="$4 short"
575 else 618 else
576 if test $ac_cv_sizeof_int -ge $3; then 619 if test "$ac_cv_sizeof_int" -ge $3; then
577 $1="$4 int" 620 $1="$4 int"
578 else 621 else
579 if test $ac_cv_sizeof_long -ge $3; then 622 if test "$ac_cv_sizeof_long" -ge $3; then
580 $1="$4 long" 623 $1="$4 long"
581 else 624 else
582 if test $ac_cv_sizeof_long_long -ge $3; then 625 if test "$ac_cv_sizeof_long_long" -ge $3; then
583 $1="$4 long long" 626 $1="$4 long long"
584 else 627 else
585 $1="$4 $5" # we _must_ have a (possibly wrong) default 628 $1="$4 $5" # we _must_ have a (possibly wrong) default
586 fi 629 fi
587 fi 630 fi
… …
614dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef) 657dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
615dnl AC_SUBST(rxvt_uint64_typedef) 658dnl AC_SUBST(rxvt_uint64_typedef)
616dnl# 659dnl#
617dnl# Now look for another we use 660dnl# Now look for another we use
618dnl# 661dnl#
619if test $ac_cv_sizeof_int_p -eq 8; then 662if test "$ac_cv_sizeof_int_p" -eq 8; then
620 rxvt_intp_define="#define intp_t int64_t" 663 rxvt_intp_define="#define intp_t int64_t"
621 rxvt_u_intp_define="#define u_intp_t u_int64_t" 664 rxvt_u_intp_define="#define u_intp_t u_int64_t"
622else 665else
623 if test $ac_cv_sizeof_int_p -eq 4; then 666 if test "$ac_cv_sizeof_int_p" -eq 4; then
624 rxvt_intp_define="#define intp_t int32_t" 667 rxvt_intp_define="#define intp_t int32_t"
625 rxvt_u_intp_define="#define u_intp_t u_int32_t" 668 rxvt_u_intp_define="#define u_intp_t u_int32_t"
626 else 669 else
627 if test $ac_cv_sizeof_int_p -eq 2; then 670 if test "$ac_cv_sizeof_int_p" -eq 2; then
628 rxvt_intp_define="#define intp_t int16_t" 671 rxvt_intp_define="#define intp_t int16_t"
629 rxvt_u_intp_define="#define u_intp_t u_int16_t" 672 rxvt_u_intp_define="#define u_intp_t u_int16_t"
630 else 673 else
631 rxvt_intp_define="#error set intp_t" 674 rxvt_intp_define="#error set intp_t"
632 rxvt_u_intp_define="#error set u_intp_t" 675 rxvt_u_intp_define="#error set u_intp_t"
… …
664 unlockpt \ 707 unlockpt \
665 isastream \ 708 isastream \
666 on_exit \ 709 on_exit \
667 nanosleep \ 710 nanosleep \
668 updwtmp \ 711 updwtmp \
712 updwtmpx \
669 ttyslot \ 713 ttyslot \
670) 714)
671dnl# Note: On NetBSD, openpty() exists in libutil. Don't pull it in 715dnl# Note: On NetBSD, openpty() exists in libutil. Don't pull it in
672 716
673dnl# -------------------------------------------------------------------------- 717dnl# --------------------------------------------------------------------------
… …
676dnl# check for host field in utmp structure 720dnl# check for host field in utmp structure
677 721
678dnl# -------------------------------------------- 722dnl# --------------------------------------------
679AC_CHECK_HEADER(utmp.h, 723AC_CHECK_HEADER(utmp.h,
680[AC_CACHE_CHECK([for struct utmp], rxvt_cv_struct_utmp, 724[AC_CACHE_CHECK([for struct utmp], rxvt_cv_struct_utmp,
681[AC_TRY_COMPILE([#include <sys/types.h> 725[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
682#include <stdint.h> 726#include <stdint.h>
683#include <utmp.h>], 727#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 728if test x$rxvt_cv_struct_utmp = xyes; then
687 AC_DEFINE(HAVE_STRUCT_UTMP, 1, Define if utmp.h has struct utmp) 729 AC_DEFINE(HAVE_STRUCT_UTMP, 1, Define if utmp.h has struct utmp)
688fi 730fi
689] 731]
690 732
691AC_CACHE_CHECK(for ut_host in utmp struct, rxvt_cv_struct_utmp_host, 733AC_CACHE_CHECK(for ut_host in utmp struct, rxvt_cv_struct_utmp_host,
692[AC_TRY_COMPILE([#include <sys/types.h> 734[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
693#include <utmp.h>], 735#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 736if test x$rxvt_cv_struct_utmp_host = xyes; then
697 AC_DEFINE(HAVE_UTMP_HOST, 1, Define if struct utmp contains ut_host) 737 AC_DEFINE(HAVE_UTMP_HOST, 1, Define if struct utmp contains ut_host)
698fi 738fi
699 739
700AC_CACHE_CHECK(for ut_pid in utmp struct, rxvt_cv_struct_utmp_pid, 740AC_CACHE_CHECK(for ut_pid in utmp struct, rxvt_cv_struct_utmp_pid,
701[AC_TRY_COMPILE([#include <sys/types.h> 741[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
702#include <utmp.h>], 742#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 743if test x$rxvt_cv_struct_utmp_pid = xyes; then
706 AC_DEFINE(HAVE_UTMP_PID, 1, Define if struct utmp contains ut_pid) 744 AC_DEFINE(HAVE_UTMP_PID, 1, Define if struct utmp contains ut_pid)
707fi 745fi
708) dnl# AC_CHECK_HEADER(utmp.h 746) dnl# AC_CHECK_HEADER(utmp.h
709 747
710dnl# -------------------------------------------- 748dnl# --------------------------------------------
711 749
712AC_CHECK_HEADER(utmpx.h, 750AC_CHECK_HEADER(utmpx.h,
713[AC_CACHE_CHECK([for struct utmpx], rxvt_cv_struct_utmpx, 751[AC_CACHE_CHECK([for struct utmpx], rxvt_cv_struct_utmpx,
752[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
753#include <utmpx.h>]], [[struct utmpx ut;]])],[rxvt_cv_struct_utmpx=yes],[rxvt_cv_struct_utmpx=no])])
754if test x$rxvt_cv_struct_utmpx = xyes; then
755 AC_DEFINE(HAVE_STRUCT_UTMPX, 1, Define if utmpx.h has struct utmpx)
756fi
757]
758
759AC_CACHE_CHECK(for host in utmpx struct, rxvt_cv_struct_utmpx_host,
760[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
761#include <utmpx.h>]], [[struct utmpx utx; utx.ut_host;]])],[rxvt_cv_struct_utmpx_host=yes],[rxvt_cv_struct_utmpx_host=no])])
762if test x$rxvt_cv_struct_utmpx_host = xyes; then
763 AC_DEFINE(HAVE_UTMPX_HOST, 1, Define if struct utmpx contains ut_host)
764fi
765
766AC_CACHE_CHECK(for session in utmpx struct, rxvt_cv_struct_utmpx_session,
714[AC_TRY_COMPILE([#include <sys/types.h> 767[AC_TRY_COMPILE([#include <sys/types.h>
715#include <utmpx.h>], 768#include <utmpx.h>],
716[struct utmpx ut;], 769[struct utmpx utx; utx.ut_session;],
717rxvt_cv_struct_utmpx=yes, rxvt_cv_struct_utmpx=no)]) 770rxvt_cv_struct_utmpx_session=yes, rxvt_cv_struct_utmpx_session=no)])
718if test x$rxvt_cv_struct_utmpx = xyes; then 771if 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) 772 AC_DEFINE(HAVE_UTMPX_SESSION, 1, Define if struct utmpx contains ut_session)
730fi 773fi
731) dnl# AC_CHECK_HEADER(utmpx.h 774) dnl# AC_CHECK_HEADER(utmpx.h
732
733 775
734dnl# -------------------------------------------------------------------------- 776dnl# --------------------------------------------------------------------------
735dnl# check for struct lastlog 777dnl# check for struct lastlog
736AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog, 778AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog,
737[AC_TRY_COMPILE([#include <sys/types.h> 779[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
738#include <utmp.h> 780#include <utmp.h>
739#ifdef HAVE_LASTLOG_H 781#ifdef HAVE_LASTLOG_H
740#include <lastlog.h> 782#include <lastlog.h>
741#endif 783#endif
742],
743[struct lastlog ll;],
744rxvt_cv_struct_lastlog=yes, rxvt_cv_struct_lastlog=no)]) 784]], [[struct lastlog ll;]])],[rxvt_cv_struct_lastlog=yes],[rxvt_cv_struct_lastlog=no])])
745if test x$rxvt_cv_struct_lastlog = xyes; then 785if 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) 786 AC_DEFINE(HAVE_STRUCT_LASTLOG, 1, Define if utmp.h or lastlog.h has struct lastlog)
747fi 787fi
748 788
749dnl# check for struct lastlogx 789dnl# check for struct lastlogx
750AC_CACHE_CHECK(for struct lastlogx, rxvt_cv_struct_lastlogx, 790AC_CACHE_CHECK(for struct lastlogx, rxvt_cv_struct_lastlogx,
751[AC_TRY_COMPILE([#include <sys/types.h> 791[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
752#include <utmpx.h> 792#include <utmpx.h>
753#ifdef HAVE_LASTLOG_H 793#ifdef HAVE_LASTLOG_H
754#include <lastlog.h> 794#include <lastlog.h>
755#endif 795#endif
756],
757[struct lastlogx ll;],
758rxvt_cv_struct_lastlogx=yes, rxvt_cv_struct_lastlogx=no)]) 796]], [[struct lastlogx ll;]])],[rxvt_cv_struct_lastlogx=yes],[rxvt_cv_struct_lastlogx=no])])
759if test x$rxvt_cv_struct_lastlogx = xyes; then 797if 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) 798 AC_DEFINE(HAVE_STRUCT_LASTLOGX, 1, Define if utmpx.h or lastlog.h has struct lastlogx)
761fi 799fi
762 800
763dnl# -------------------------------------------------------------------------- 801dnl# --------------------------------------------------------------------------
764dnl# FIND FILES 802dnl# FIND FILES
765dnl# -------------------------------------------------------------------------- 803dnl# --------------------------------------------------------------------------
766 804
767dnl# find utmp 805dnl# find utmp
768AC_CACHE_CHECK(where utmp is located, rxvt_cv_path_utmp, 806AC_CACHE_CHECK(where utmp is located, rxvt_cv_path_utmp,
769[AC_TRY_RUN([#include <stdio.h> 807[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
770#include <sys/types.h> 808#include <sys/types.h>
771#include <utmp.h> 809#include <utmp.h>
772#include <errno.h> 810#include <errno.h>
773main() 811main()
774{ 812{
… …
789 fprintf(f, "%s\n", *u); 827 fprintf(f, "%s\n", *u);
790 exit(0); 828 exit(0);
791 } 829 }
792 } 830 }
793 exit(0); 831 exit(0);
794}], rxvt_cv_path_utmp=`cat conftestval`, rxvt_cv_path_utmp=, dnl 832}]])],[rxvt_cv_path_utmp=`cat conftestval`],[rxvt_cv_path_utmp=],[dnl
795 AC_MSG_WARN([Define RXVT_UTMP_FILE in config.h manually]))]) 833 AC_MSG_WARN(Define RXVT_UTMP_FILE in config.h manually)])])
796if test x$rxvt_cv_path_utmp != x; then 834if test x$rxvt_cv_path_utmp != x; then
797 AC_DEFINE_UNQUOTED(RXVT_UTMP_FILE, "$rxvt_cv_path_utmp", Define location of utmp) 835 AC_DEFINE_UNQUOTED(RXVT_UTMP_FILE, "$rxvt_cv_path_utmp", Define location of utmp)
798fi 836fi
799 837
800dnl# -------------------------------------------------------------------------- 838dnl# --------------------------------------------------------------------------
801 839
802dnl# find utmpx - if a utmp file exists at the same location and is more than 840dnl# 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. 841dnl# a day newer, then dump the utmpx. People leave lots of junk around.
804AC_CACHE_CHECK(where utmpx is located, rxvt_cv_path_utmpx, 842AC_CACHE_CHECK(where utmpx is located, rxvt_cv_path_utmpx,
805[AC_TRY_RUN([#include <stdio.h> 843[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
806#include <sys/types.h> 844#include <sys/types.h>
807#include <utmpx.h> 845#include <utmpx.h>
808#include <errno.h> 846#include <errno.h>
809#include <sys/stat.h> 847#include <sys/stat.h>
810#ifdef HAVE_STRING_H 848#ifdef HAVE_STRING_H
… …
835 fprintf(f, "%s\n", *u); 873 fprintf(f, "%s\n", *u);
836 exit(0); 874 exit(0);
837 } 875 }
838 } 876 }
839 exit(0); 877 exit(0);
840}], rxvt_cv_path_utmpx=`cat conftestval`, rxvt_cv_path_utmpx=, dnl 878}]])],[rxvt_cv_path_utmpx=`cat conftestval`],[rxvt_cv_path_utmpx=],[dnl
841 AC_MSG_WARN([Define RXVT_UTMPX_FILE in config.h manually]))]) 879 AC_MSG_WARN(Define RXVT_UTMPX_FILE in config.h manually)])])
842if test x$rxvt_cv_path_utmpx != x; then 880if test x$rxvt_cv_path_utmpx != x; then
843 AC_DEFINE_UNQUOTED(RXVT_UTMPX_FILE, "$rxvt_cv_path_utmpx", Define location of utmpx) 881 AC_DEFINE_UNQUOTED(RXVT_UTMPX_FILE, "$rxvt_cv_path_utmpx", Define location of utmpx)
844fi 882fi
845 883
846dnl# -------------------------------------------------------------------------- 884dnl# --------------------------------------------------------------------------
847 885
848dnl# find wtmp 886dnl# find wtmp
849AC_CACHE_CHECK(where wtmp is located, rxvt_cv_path_wtmp, 887AC_CACHE_CHECK(where wtmp is located, rxvt_cv_path_wtmp,
850[AC_TRY_RUN([#include <stdio.h> 888[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
851#include <sys/types.h> 889#include <sys/types.h>
852#ifdef HAVE_UTMP_H 890#ifdef HAVE_UTMP_H
853#include <utmp.h> 891#include <utmp.h>
854#endif 892#endif
855#include <errno.h> 893#include <errno.h>
… …
872 fprintf(f, "%s\n", *w); 910 fprintf(f, "%s\n", *w);
873 exit(0); 911 exit(0);
874 } 912 }
875 } 913 }
876 exit(0); 914 exit(0);
877}], rxvt_cv_path_wtmp=`cat conftestval`, rxvt_cv_path_wtmp=, dnl 915}]])],[rxvt_cv_path_wtmp=`cat conftestval`],[rxvt_cv_path_wtmp=],[dnl
878 AC_MSG_WARN([Define RXVT_WTMP_FILE in config.h manually]))]) 916 AC_MSG_WARN(Define RXVT_WTMP_FILE in config.h manually)])])
879if test x$rxvt_cv_path_wtmp != x; then 917if test x$rxvt_cv_path_wtmp != x; then
880 AC_DEFINE_UNQUOTED(RXVT_WTMP_FILE, "$rxvt_cv_path_wtmp", Define location of wtmp) 918 AC_DEFINE_UNQUOTED(RXVT_WTMP_FILE, "$rxvt_cv_path_wtmp", Define location of wtmp)
881fi 919fi
882dnl# -------------------------------------------------------------------------- 920dnl# --------------------------------------------------------------------------
883 921
884dnl# find wtmpx 922dnl# find wtmpx
885AC_CACHE_CHECK(where wtmpx is located, rxvt_cv_path_wtmpx, 923AC_CACHE_CHECK(where wtmpx is located, rxvt_cv_path_wtmpx,
886[AC_TRY_RUN([#include <stdio.h> 924[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
887#ifdef HAVE_UTMPX_H 925#ifdef HAVE_UTMPX_H
888#include <utmpx.h> 926#include <utmpx.h>
889#endif 927#endif
890#include <errno.h> 928#include <errno.h>
891main() 929main()
… …
907 fprintf(f, "%s\n", *w); 945 fprintf(f, "%s\n", *w);
908 exit(0); 946 exit(0);
909 } 947 }
910 } 948 }
911 exit(0); 949 exit(0);
912}], rxvt_cv_path_wtmpx=`cat conftestval`, rxvt_cv_path_wtmpx=, dnl 950}]])],[rxvt_cv_path_wtmpx=`cat conftestval`],[rxvt_cv_path_wtmpx=],[dnl
913 AC_MSG_WARN([Define RXVT_WTMPX_FILE in config.h manually]))]) 951 AC_MSG_WARN(Define RXVT_WTMPX_FILE in config.h manually)])])
914if test x$rxvt_cv_path_wtmpx != x; then 952if test x$rxvt_cv_path_wtmpx != x; then
915 AC_DEFINE_UNQUOTED(RXVT_WTMPX_FILE, "$rxvt_cv_path_wtmpx", Define location of wtmpx) 953 AC_DEFINE_UNQUOTED(RXVT_WTMPX_FILE, "$rxvt_cv_path_wtmpx", Define location of wtmpx)
916fi 954fi
917dnl# -------------------------------------------------------------------------- 955dnl# --------------------------------------------------------------------------
918 956
919dnl# find lastlog 957dnl# find lastlog
920AC_CACHE_CHECK(where lastlog is located, rxvt_cv_path_lastlog, 958AC_CACHE_CHECK(where lastlog is located, rxvt_cv_path_lastlog,
921[AC_TRY_RUN([#include <stdio.h> 959[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
922#include <sys/types.h> 960#include <sys/types.h>
923#ifdef HAVE_UTMPX_H 961#ifdef HAVE_UTMPX_H
924#include <utmpx.h> 962#include <utmpx.h>
925#elif defined(HAVE_UTMP_H) 963#elif defined(HAVE_UTMP_H)
926#include <utmp.h> 964#include <utmp.h>
… …
947 fprintf(f, "%s\n", *w); 985 fprintf(f, "%s\n", *w);
948 exit(0); 986 exit(0);
949 } 987 }
950 } 988 }
951 exit(0); 989 exit(0);
952}], rxvt_cv_path_lastlog=`cat conftestval`, rxvt_cv_path_lastlog=, dnl 990}]])],[rxvt_cv_path_lastlog=`cat conftestval`],[rxvt_cv_path_lastlog=],[dnl
953 AC_MSG_WARN([Define RXVT_LASTLOG_FILE in config.h manually]))]) 991 AC_MSG_WARN(Define RXVT_LASTLOG_FILE in config.h manually)])])
954if test x$rxvt_cv_path_lastlog != x; then 992if test x$rxvt_cv_path_lastlog != x; then
955 AC_DEFINE_UNQUOTED(RXVT_LASTLOG_FILE, "$rxvt_cv_path_lastlog", Define location of lastlog) 993 AC_DEFINE_UNQUOTED(RXVT_LASTLOG_FILE, "$rxvt_cv_path_lastlog", Define location of lastlog)
956 if test -d "$rxvt_cv_path_lastlog"; then 994 if test -d "$rxvt_cv_path_lastlog"; then
957 AC_DEFINE(LASTLOG_IS_DIR, 1, Define if lastlog is provided via a directory) 995 AC_DEFINE(LASTLOG_IS_DIR, 1, Define if lastlog is provided via a directory)
958 fi 996 fi
959fi 997fi
960dnl# -------------------------------------------------------------------------- 998dnl# --------------------------------------------------------------------------
961 999
962dnl# find lastlogx 1000dnl# find lastlogx
963AC_CACHE_CHECK(where lastlogx is located, rxvt_cv_path_lastlogx, 1001AC_CACHE_CHECK(where lastlogx is located, rxvt_cv_path_lastlogx,
964[AC_TRY_RUN([#include <stdio.h> 1002[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
965#ifdef HAVE_UTMPX_H 1003#ifdef HAVE_UTMPX_H
966#include <utmpx.h> 1004#include <utmpx.h>
967#endif 1005#endif
968#include <errno.h> 1006#include <errno.h>
969main() 1007main()
… …
984 fprintf(f, "%s\n", *w); 1022 fprintf(f, "%s\n", *w);
985 exit(0); 1023 exit(0);
986 } 1024 }
987 } 1025 }
988 exit(0); 1026 exit(0);
989}], rxvt_cv_path_lastlogx=`cat conftestval`, rxvt_cv_path_lastlogx=, dnl 1027}]])],[rxvt_cv_path_lastlogx=`cat conftestval`],[rxvt_cv_path_lastlogx=],[dnl
990 AC_MSG_WARN([Define RXVT_LASTLOGX_FILE in config.h manually]))]) 1028 AC_MSG_WARN(Define RXVT_LASTLOGX_FILE in config.h manually)])])
991if test x$rxvt_cv_path_lastlogx != x; then 1029if test x$rxvt_cv_path_lastlogx != x; then
992 AC_DEFINE_UNQUOTED(RXVT_LASTLOGX_FILE, "$rxvt_cv_path_lastlogx", Define location of lastlogx) 1030 AC_DEFINE_UNQUOTED(RXVT_LASTLOGX_FILE, "$rxvt_cv_path_lastlogx", Define location of lastlogx)
993fi 1031fi
994 1032
995dnl# -------------------------------------------------------------------------- 1033dnl# --------------------------------------------------------------------------
… …
1019LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 1057LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
1020if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then 1058if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
1021 LIBS=`echo $LIBS | sed "$R_TRANSLATE"` 1059 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
1022fi 1060fi
1023AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 1061AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
1024[AC_TRY_RUN([#include <X11/Xlib.h> 1062[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
1025main() { 1063main() {
1026char *p; 1064char *p;
1027if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 1065if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
1028exit (XSupportsLocale() ? 0 : 1); 1066exit (XSupportsLocale() ? 0 : 1);
1029else 1067else
1030exit (1);}], dnl 1068exit (1);}]])],[dnl
1031 rxvt_cv_func_xlocale=yes, rxvt_cv_func_xlocale=no, dnl 1069 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
1032 AC_MSG_WARN([Define NO_XLOCALE in config.h manually]))]) 1070 AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])])
1033if test x$rxvt_cv_func_xlocale = xyes; then 1071if test x$rxvt_cv_func_xlocale = xyes; then
1034 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works) 1072 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works)
1035fi 1073fi
1036 1074
1037AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, 1075AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
1038[AC_TRY_LINK([#define X_LOCALE 1 1076[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
1039#include <X11/Xlocale.h>], 1077#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 1078if test x$rxvt_cv_func_xsetlocale = xyes; then
1043 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 1079 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
1044fi 1080fi
1045LIBS=$ac_save_LIBS 1081LIBS=$ac_save_LIBS
1046CFLAGS=$ac_save_CFLAGS 1082CFLAGS=$ac_save_CFLAGS
1047 1083
1048AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale, 1084AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
1049[AC_TRY_LINK([#include <clocale>], 1085[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 1086if test x$rxvt_cv_func_setlocale = xyes; then
1053 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works) 1087 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
1054fi 1088fi
1055 1089
1056AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo, 1090AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,
1057[AC_TRY_LINK([#include <langinfo.h>], 1091[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 1092if test x$rxvt_cv_func_nl_langinfo = xyes; then
1061 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) 1093 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
1062fi 1094fi
1063 1095
1096AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
1097[AC_COMPILE_IFELSE([
1098#include <X11/Xlib.h>
1099
1100void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
1101
1102void f() {
1103 XIMCallback cb;
1104 cb.callback = im_destroy_cb;
1105}
1106],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)])
1107
1108if test x$rxvt_broken_ximcb = xyes; then
1109 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
1110fi
1111
1064AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt, 1112AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt,
1065[AC_TRY_LINK([#define _GNU_SOURCE 1113[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define _GNU_SOURCE
1066#ifdef HAVE_STDLIB_H 1114#ifdef HAVE_STDLIB_H
1067# include <cstdlib> 1115# include <cstdlib>
1068#endif], 1116#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 1117if test x$rxvt_cv_func_getpt = xyes; then
1072 AC_DEFINE(HAVE_GETPT, 1, Define if you have _GNU_SOURCE getpt() ) 1118 AC_DEFINE(HAVE_GETPT, 1, Define if you have _GNU_SOURCE getpt() )
1073fi 1119fi
1074 1120
1075dnl# if we don't guess right then it's up to the user 1121dnl# 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 1179if 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) 1180 AC_DEFINE(PTYS_ARE_SEARCHED, 1, Define for this pty type)
1135fi 1181fi
1136 1182
1137 1183
1138AC_CHECKING(for pty ranges) 1184AS_MESSAGE(checking for pty ranges...)
1139ptys=`echo /dev/pty??` 1185ptys=`echo /dev/pty??`
1140pch1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'` 1186pch1=`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'` 1187pch2=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'`
1142if test x$pch1 != x; then 1188if test x$pch1 != x; then
1143 AC_DEFINE_UNQUOTED(PTYCHAR1, "$pch1", Define for first char in devptyXX) 1189 AC_DEFINE_UNQUOTED(PTYCHAR1, "$pch1", Define for first char in devptyXX)
1144fi 1190fi
1145if test x$pch2 != x; then 1191if test x$pch2 != x; then
1146 AC_DEFINE_UNQUOTED(PTYCHAR2, "$pch2", Define for second char in devptyXX) 1192 AC_DEFINE_UNQUOTED(PTYCHAR2, "$pch2", Define for second char in devptyXX)
1147fi 1193fi
1148 1194
1149dnl# FreeBSD needs to link libxpg4
1150AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])
1151
1152dnl# -------------------------------------------------------------------------- 1195dnl# --------------------------------------------------------------------------
1153dnl# now add and remove other stuff 1196dnl# now add and remove other stuff
1154dnl# -------------------------------------------------------------------------- 1197dnl# --------------------------------------------------------------------------
1198if test x$support_xft = xyes; then
1199 LIBS="$LIBS `pkg-config xft --libs`"
1200 CFLAGS="$CFLAGS `pkg-config xft --cflags`"
1201 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
1202
1203 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
1204 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
1205
1206 if test x$support_xft = xyes; then
1207 AC_DEFINE(XFT, 1, Define to enable xft support)
1208 fi
1209fi
1210if test x$support_styles = xyes; then
1211 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
1212fi
1213if test x$support_iso14755 = xyes; then
1214 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
1215fi
1216if test x$support_8bitctrls = xyes; then
1217 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
1218fi
1219if test x$support_fading = xyes; then
1220 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
1221fi
1222if test x$support_tinting = xyes; then
1223 AC_DEFINE(TINTING, 1, Define if you want your background to be tinted)
1224fi
1155if test x$support_inheritpixmap = xyes; then 1225if test x$support_inheritpixmap = xyes; then
1156 AC_DEFINE(TRANSPARENT, 1, Define if you want your background to use the parent window background) 1226 AC_DEFINE(TRANSPARENT, 1, Define if you want your background to use the parent window background)
1157fi 1227fi
1158if test x$support_keepscrolling = xno; then 1228if 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) 1229 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) 1232 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)
1163fi 1233fi
1164if test x$support_menubar = xyes; then 1234if test x$support_menubar = xyes; then
1165 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support) 1235 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support)
1166fi 1236fi
1167if test x$support_frills = xno; then 1237if test x$support_frills = xyes; then
1168 AC_DEFINE(NO_FRILLS, 1, Define if you don't want handling for rarely used features) 1238 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 1239fi
1173if test x$support_24bit = xyes; then 1240if 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) 1241 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 1242fi
1176if test x$support_mousewheel = xyes; then 1243if test x$support_mousewheel = xyes; then
… …
1226fi 1293fi
1227if test x$support_combining = xyes; then 1294if test x$support_combining = xyes; then
1228 AC_DEFINE(ENABLE_COMBINING, 1, Define if you want to automatically compose combining characters) 1295 AC_DEFINE(ENABLE_COMBINING, 1, Define if you want to automatically compose combining characters)
1229fi 1296fi
1230if test x$codesets = xall; then 1297if test x$codesets = xall; then
1231 codesets=jp,jp-ext,kr,cn,cn-ext 1298 codesets=jp,jp-ext,kr,zh,zh-ext
1232fi 1299fi
1300AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
1301AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
1233for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do 1302for 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 1303 case "$codeset" in
1237 JP ) AC_DEFINE(ENCODING_JP, 1, Define if you want japanese codesets) ;; 1304 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) ;; 1305 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) ;; 1306 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) ;; 1307 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) ;; 1308 ZH_EXT ) AC_DEFINE(ENCODING_ZH_EXT, 1, Define if you want extended chinese codesets) ;;
1242 esac 1309 esac
1243done 1310done
1244 1311
1245dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket) 1312dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket)
1246 1313
… …
1301RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch) 1368RXVT_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) 1369RXVT_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) 1370RXVT_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) 1371RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
1305 1372
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 \ 1373AC_CONFIG_FILES([autoconf/Make.common \
1320Makefile \ 1374Makefile \
1321doc/Makefile \ 1375doc/Makefile \
1322src/Makefile \ 1376src/Makefile \
1323src/test/Makefile \
1324src/rxvtlib.h \ 1377src/rxvtlib.h \
1325W11/Makefile \ 1378])
1326) 1379AC_OUTPUT
1327 1380
1328echo "Configuration: 1381echo "Configuration:
1329 1382
1330 Rxvt version: $VERSION : $DATE 1383 Rxvt version: $VERSION : $DATE
1331 Source code location: $srcdir 1384 Source code location: $srcdir
… …
1399 echo ". functions could not be found. ." 1452 echo ". functions could not be found. ."
1400 echo ". XIM is now being DISABLED! ." 1453 echo ". XIM is now being DISABLED! ."
1401 echo ".----------------------------------------------------------------." 1454 echo ".----------------------------------------------------------------."
1402fi 1455fi
1403 1456
1404echo " *** Please check src/feature.h for further options ***" 1457echo " *** Optionally check src/feature.h for further options ***"
1405echo 1458echo
1406 1459
1407echo ".----------------------------------------------------------------." 1460echo ".----------------------------------------------------------------."
1408echo ". NOTE: most features are disabled by default, try ." 1461echo ". NOTE: most features are disabled by default, try ."
1409echo ". configure --help to get an idea of the optional features ." 1462echo ". configure --help to get an idea of the optional features, ."
1463echo ". or read ./README.configure ."
1464echo ". ."
1465echo ". The script ./reconf gives a reasonable baseline, try it if ."
1466echo ". you do not want to read documentation and still want some ."
1467echo ". useful features. ."
1410echo ".----------------------------------------------------------------." 1468echo ".----------------------------------------------------------------."
1411echo 1469echo
1412 1470

Diff Legend

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