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.26 by pcg, Mon Apr 5 15:54:23 2004 UTC vs.
Revision 1.51 by root, Wed Feb 16 21:21:43 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.)
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
45 68
46dnl if test x$GXX = xyes; then 69dnl if test x$GXX = xyes; then
47dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now... 70dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now...
48dnl fi 71dnl fi
49 72
… …
58 81
59dnl solaris needs to link libnsl and socket 82dnl solaris needs to link libnsl and socket
60AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"]) 83AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])
61AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"]) 84AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])
62 85
63AC_ENABLE_SHARED(no)dnl# libtool 86dnl AC_ENABLE_SHARED(no)dnl# libtool
64AC_ENABLE_STATIC(yes)dnl# libtool 87dnl AC_ENABLE_STATIC(yes)dnl# libtool
65AC_PROG_LIBTOOL()dnl# libtool 88dnl AC_PROG_LIBTOOL()dnl# libtool
66 89
67MALLOC_TYPE=S 90MALLOC_TYPE=S
68support_addstrings=no 91support_addstrings=no
69support_frills=no 92support_frills=no
70support_linespace=no
71support_inheritpixmap=no 93support_inheritpixmap=no
72support_tinting=no 94support_tinting=no
95support_fading=no
73support_keepscrolling=no 96support_keepscrolling=no
74support_selectionscrolling=no 97support_selectionscrolling=no
75support_menubar=no 98support_menubar=no
76support_mousewheel=no 99support_mousewheel=no
77support_mouseslipwheel=no 100support_mouseslipwheel=no
… …
88support_xim=no 111support_xim=no
89support_xpm=no 112support_xpm=no
90support_xft=no 113support_xft=no
91support_unicode3=no 114support_unicode3=no
92support_combining=no 115support_combining=no
116support_8bitctrls=no
117support_iso14755=no
118support_styles=no
93codesets= 119codesets=
94 120
95dnl# -------------------------------------------------------------------------- 121dnl# --------------------------------------------------------------------------
96dnl# CHECKING COMMAND LINE OPTIONS 122dnl# CHECKING COMMAND LINE OPTIONS
97dnl# -------------------------------------------------------------------------- 123dnl# --------------------------------------------------------------------------
… …
107 NOTE: this option is order dependent 133 NOTE: this option is order dependent
108 NOTE: automatically enabled with --enable-shared], 134 NOTE: automatically enabled with --enable-shared],
109 [if test x$enableval = xyes; then 135 [if test x$enableval = xyes; then
110 support_24bit=yes 136 support_24bit=yes
111 support_frills=yes 137 support_frills=yes
112 support_linespace=yes
113 support_inheritpixmap=yes 138 support_inheritpixmap=yes
114 support_tinting=yes 139 support_tinting=yes
140 support_fading=yes
115 support_keepscrolling=yes 141 support_keepscrolling=yes
116 support_selectionscrolling=yes 142 support_selectionscrolling=yes
117 support_lastlog=yes 143 support_lastlog=yes
118 support_menubar=yes 144 support_menubar=yes
119 support_mousewheel=yes 145 support_mousewheel=yes
… …
130 support_xim=yes 156 support_xim=yes
131 support_xpm=yes 157 support_xpm=yes
132 support_xft=yes 158 support_xft=yes
133 support_unicode3=yes 159 support_unicode3=yes
134 support_combining=yes 160 support_combining=yes
161 #support_8bitctrls=yes
162 support_iso14755=yes
163 support_styles=yes
135 codesets=all 164 codesets=all
136 fi]) 165 fi])
137 166
138AC_ARG_ENABLE(unicode3, 167AC_ARG_ENABLE(unicode3,
139 [ --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],
140 [if test x$enableval = xyes -o x$enableval = xno; then 169 [if test x$enableval = xyes -o x$enableval = xno; then
141 support_unicode3=yes 170 support_unicode3=$enableval
142 fi]) 171 fi])
143 172
144AC_ARG_ENABLE(combining, 173AC_ARG_ENABLE(combining,
145 [ --enable-combining enable composition of base and combining characters], 174 [ --enable-combining enable composition of base and combining characters],
146 [if test x$enableval = xyes -o x$enableval = xno; then 175 [if test x$enableval = xyes -o x$enableval = xno; then
147 support_combining=yes 176 support_combining=$enableval
148 fi]) 177 fi])
149 178
150AC_ARG_ENABLE(xft, 179AC_ARG_ENABLE(xft,
151 [ --enable-xft enable xft support on systems that have it], 180 [ --enable-xft enable xft support on systems that have it],
152 [if test x$enableval = xyes -o x$enableval = xno; then 181 [if test x$enableval = xyes -o x$enableval = xno; then
153 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
154 fi]) 189 fi])
155 190
156AC_ARG_ENABLE(utmp, 191AC_ARG_ENABLE(utmp,
157 [ --enable-utmp enable utmp (utmpx) support], 192 [ --enable-utmp enable utmp (utmpx) support],
158 [if test x$enableval = xyes -o x$enableval = xno; then 193 [if test x$enableval = xyes -o x$enableval = xno; then
… …
185 220
186AC_ARG_ENABLE(tinting, 221AC_ARG_ENABLE(tinting,
187 [ --enable-tinting enable tinting of transparent bg], 222 [ --enable-tinting enable tinting of transparent bg],
188 [if test x$enableval = xyes -o x$enableval = xno; then 223 [if test x$enableval = xyes -o x$enableval = xno; then
189 support_tinting=$enableval 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
190 fi]) 231 fi])
191 232
192AC_ARG_ENABLE(menubar, 233AC_ARG_ENABLE(menubar,
193 [ --enable-menubar enable menubar], 234 [ --enable-menubar enable menubar],
194 [if test x$enableval = xyes -o x$enableval = xno; then 235 [if test x$enableval = xyes -o x$enableval = xno; then
… …
224 [if test x$enableval = xyes; then 265 [if test x$enableval = xyes; then
225 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)
226 fi]) 267 fi])
227 268
228AC_ARG_WITH(codesets, 269AC_ARG_WITH(codesets,
229 [ --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)],
230 [codesets="$withval"]) 271 [codesets="$withval"])
231 272
232AC_ARG_ENABLE(xim, 273AC_ARG_ENABLE(xim,
233 [ --enable-xim XIM (X Input Method) protocol support], 274 [ --enable-xim XIM (X Input Method) protocol support],
234 [if test x$enableval = xyes -o x$enableval = xno; then 275 [if test x$enableval = xyes -o x$enableval = xno; then
… …
261 302
262AC_ARG_ENABLE(xgetdefault, 303AC_ARG_ENABLE(xgetdefault,
263 [ --enable-xgetdefault enable resources via X instead of our small version], 304 [ --enable-xgetdefault enable resources via X instead of our small version],
264 [if test x$enableval = xyes; then 305 [if test x$enableval = xyes; then
265 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
266 fi]) 313 fi])
267 314
268RESFALLBACK=Rxvt 315RESFALLBACK=Rxvt
269AC_ARG_ENABLE(fallback, 316AC_ARG_ENABLE(fallback,
270 [ --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)],
… …
292 339
293RXVTNAME=urxvt 340RXVTNAME=urxvt
294AC_ARG_WITH(name, 341AC_ARG_WITH(name,
295 [ --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)],
296 [RXVTNAME="$withval"]) 343 [RXVTNAME="$withval"])
344AC_DEFINE_UNQUOTED(RXVTNAME,"$RXVTNAME", [Binary base name])
297 345
298RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"` 346RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"`
299AC_SUBST(RXVTNAME) 347AC_SUBST(RXVTNAME)
300 348
301AC_ARG_ENABLE(strings, 349AC_ARG_ENABLE(strings,
… …
308 [ --disable-swapscreen disable swap screen support], 356 [ --disable-swapscreen disable swap screen support],
309 [if test x$enableval = xno; then 357 [if test x$enableval = xno; then
310 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)
311 fi]) 359 fi])
312 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
313AC_ARG_ENABLE(frills, 367AC_ARG_ENABLE(frills,
314 [ --enable-frills enable support for rarely used features], 368 [ --enable-frills enable support for rarely used features],
315 [if test x$enableval = xyes -o x$enableval = xno; then 369 [if test x$enableval = xyes -o x$enableval = xno; then
316 support_frills=$enableval 370 support_frills=$enableval
317 fi])
318
319AC_ARG_ENABLE(linespace,
320 [ --enable-linespace enable support for linespace],
321 [if test x$enableval = xyes -o x$enableval = xno; then
322 support_linespace=$enableval
323 fi]) 371 fi])
324 372
325AC_ARG_ENABLE(24bit, 373AC_ARG_ENABLE(24bit,
326 [ --enable-24bit enable support for using 24bit visuals if available], 374 [ --enable-24bit enable support for using 24bit visuals if available],
327 [if test x$enableval = xyes -o x$enableval = xno; then 375 [if test x$enableval = xyes -o x$enableval = xno; then
… …
375 [ --enable-smart-resize enable smart growth/shrink behaviour], 423 [ --enable-smart-resize enable smart growth/shrink behaviour],
376 [if test x$enableval = xyes; then 424 [if test x$enableval = xyes; then
377 AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior) 425 AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior)
378 fi]) 426 fi])
379 427
380AC_ARG_ENABLE(256-color,
381 [ --enable-256-color enable 256-color support],
382 [if test x$enableval = xyes; then
383 AC_DEFINE(TTY_256COLOR, 1, Define if you want 256 colour support)
384 fi])
385
386AC_ARG_ENABLE(cursor-blink, 428AC_ARG_ENABLE(cursor-blink,
387 [ --enable-cursor-blink enable blinking cursor], 429 [ --enable-cursor-blink enable blinking cursor],
388 [if test x$enableval = xyes -o x$enableval = xno; then 430 [if test x$enableval = xyes -o x$enableval = xno; then
389 support_cursor_blink=$enableval 431 support_cursor_blink=$enableval
390 fi]) 432 fi])
… …
414 fi]) 456 fi])
415 457
416dnl# -------------------------------------------------------------------------- 458dnl# --------------------------------------------------------------------------
417 459
418AC_DEFINE(PROTOTYPES, 1, Define if you need function prototypes) 460AC_DEFINE(PROTOTYPES, 1, Define if you need function prototypes)
419
420dnl# --------------------------------------------------------------------------
421dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
422dnl#
423if test -z "$CFLAGS"; then
424 if test -z "$CCOPTS"; then
425 CCOPTS='-O'
426dnl> if test "x$GCC" = xyes; then
427dnl> if test x$system = xLinux; then
428dnl> CCOPTS="$CCOPTS "'-O2 -fno-strength-reduce'
429dnl> fi
430dnl> fi
431 fi
432 CFLAGS="$CCOPTS"
433fi
434 461
435AC_PATH_PROG(MV, mv, mv) 462AC_PATH_PROG(MV, mv, mv)
436AC_PATH_PROG(RM, rm, rm) 463AC_PATH_PROG(RM, rm, rm)
437AC_PATH_PROG(CP, cp, cp) 464AC_PATH_PROG(CP, cp, cp)
438AC_PATH_PROG(LN, ln, ln) 465AC_PATH_PROG(LN, ln, ln)
439AC_PATH_PROG(SED, sed, sed) 466AC_PATH_PROG(SED, sed, sed)
440AC_PATH_PROG(ECHO, echo, echo) 467AC_PATH_PROG(ECHO, echo, echo)
441AC_PATH_PROG(CMP, cmp, cmp) 468AC_PATH_PROG(CMP, cmp, cmp)
442AC_PATH_PROG(TBL, tbl) 469AC_PATH_PROG(TBL, tbl)
470AC_PATH_PROG(TIC, tic)
443 471
444dnl# need a neat way to detect SVR4 or its features 472dnl# need a neat way to detect SVR4 or its features
445dnl# in src/command.c we use these functions: 473dnl# in src/command.c we use these functions:
446dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> 474dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
447dnl# - but are these also defined for other systems? 475dnl# - but are these also defined for other systems?
… …
484 sys/byteorder.h \ 512 sys/byteorder.h \
485 sys/ioctl.h \ 513 sys/ioctl.h \
486 sys/select.h \ 514 sys/select.h \
487 sys/sockio.h \ 515 sys/sockio.h \
488 sys/strredir.h \ 516 sys/strredir.h \
517 sys/stropts.h \
489 sys/time.h \ 518 sys/time.h \
490 utmp.h \ 519 utmp.h \
491 utmpx.h \ 520 utmpx.h \
492 stdint.h \ 521 stdint.h \
522 pty.h \
523 wchar.h \
524 cwchar \
525 clocale \
493) 526)
494 527
495AC_HEADER_TIME 528AC_HEADER_TIME
496 529
497dnl# check to allow both <termios.h> and <sys/ioctl.h> 530dnl# check to allow both <termios.h> and <sys/ioctl.h>
498AC_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,
499[AC_TRY_COMPILE([#include <stdio.h> 532[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
500#include <sys/ioctl.h> 533#include <sys/ioctl.h>
501#ifdef HAVE_TERMIOS_H 534#ifdef HAVE_TERMIOS_H
502#include <termios.h> 535#include <termios.h>
503#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])])
504 537
505dnl# ELF systems may want to store paths for dynamic libraries. 538dnl# ELF systems may want to store paths for dynamic libraries.
506dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath" 539dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath"
507dnl# 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.
508if test -n "$GCC"; then 541if test -n "$GCC"; then
… …
517ac_save_CFLAGS=$CFLAGS 550ac_save_CFLAGS=$CFLAGS
518ac_save_LIBS=$LIBS 551ac_save_LIBS=$LIBS
519CFLAGS="$CFLAGS $X_CFLAGS" 552CFLAGS="$CFLAGS $X_CFLAGS"
520LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` 553LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
521AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath, 554AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath,
522[AC_TRY_RUN([ 555[AC_RUN_IFELSE([AC_LANG_SOURCE([[
523main() 556main()
524{ 557{
525 exit(0); 558 exit(0);
526 (void) XOpenDisplay("foobar"); 559 (void) XOpenDisplay("foobar");
527}], rxvt_cv_rpath=yes, rxvt_cv_rpath=no, dnl 560}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
528 AC_MSG_WARN([You may need to check the LIBS line]))]) 561 AC_MSG_WARN(You may need to check the LIBS line)])])
529if test x$rxvt_cv_rpath != xyes; then 562if test x$rxvt_cv_rpath != xyes; then
530 changequote(, )dnl 563 changequote(, )dnl
531 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g' 564 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
532 changequote([, ])dnl 565 changequote([, ])dnl
533 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"`
534 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,
535[AC_TRY_RUN([ 568[AC_RUN_IFELSE([AC_LANG_SOURCE([[
536main() 569main()
537{ 570{
538 exit(0); 571 exit(0);
539 (void) XOpenDisplay("foobar"); 572 (void) XOpenDisplay("foobar");
540}], 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])])
541 if test x$rxvt_cv_R != xyes; then 574 if test x$rxvt_cv_R != xyes; then
542 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 575 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
543 fi 576 fi
544fi 577fi
545 578
546AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 579AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
547[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])])
548rxvt_cv_xpointer=yes, rxvt_cv_xpointer=no)])
549if test x$rxvt_cv_xpointer = xyes; then 581if test x$rxvt_cv_xpointer = xyes; then
550 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 582 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
551fi 583fi
552LIBS=$ac_save_LIBS 584LIBS=$ac_save_LIBS
553CFLAGS=$ac_save_CFLAGS 585CFLAGS=$ac_save_CFLAGS
… …
566dnl> AC_CHECK_TYPE(umode_t, int) 598dnl> AC_CHECK_TYPE(umode_t, int)
567dnl> AC_CHECK_TYPE(off_t, long) 599dnl> AC_CHECK_TYPE(off_t, long)
568AC_TYPE_PID_T 600AC_TYPE_PID_T
569AC_TYPE_UID_T 601AC_TYPE_UID_T
570 602
571
572AC_CHECK_SIZEOF(char, 1)
573AC_CHECK_SIZEOF(short, 2) 603AC_CHECK_SIZEOF(short, 2)
574AC_CHECK_SIZEOF(int, 4) 604AC_CHECK_SIZEOF(int, 4)
575AC_CHECK_SIZEOF(long, 4) 605dnl AC_CHECK_SIZEOF(long, 4)
576AC_CHECK_SIZEOF(long long, 8) 606AC_CHECK_SIZEOF(long long, 8)
577AC_CHECK_SIZEOF(int *, 4) 607AC_CHECK_SIZEOF(int *, 4)
578 608
579dnl# see usage below 609dnl# see usage below
580AC_DEFUN(RXVT_CHECK_SIZE, 610AC_DEFUN(RXVT_CHECK_SIZE,
581 [AC_CACHE_CHECK([for $2], $1, 611 [AC_CACHE_CHECK([for $2], $1,
582 [AC_TRY_COMPILE([#include <stdint.h>], $2 dummy;, 612 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl
583 [$1=yes],
584 [dnl
585if test $ac_cv_sizeof_char -ge $3; then 613if test "$ac_cv_sizeof_char" -ge $3; then
586 $1="$4 char" 614 $1="$4 char"
587else 615else
588 if test $ac_cv_sizeof_short -ge $3; then 616 if test "$ac_cv_sizeof_short" -ge $3; then
589 $1="$4 short" 617 $1="$4 short"
590 else 618 else
591 if test $ac_cv_sizeof_int -ge $3; then 619 if test "$ac_cv_sizeof_int" -ge $3; then
592 $1="$4 int" 620 $1="$4 int"
593 else 621 else
594 if test $ac_cv_sizeof_long -ge $3; then 622 if test "$ac_cv_sizeof_long" -ge $3; then
595 $1="$4 long" 623 $1="$4 long"
596 else 624 else
597 if test $ac_cv_sizeof_long_long -ge $3; then 625 if test "$ac_cv_sizeof_long_long" -ge $3; then
598 $1="$4 long long" 626 $1="$4 long long"
599 else 627 else
600 $1="$4 $5" # we _must_ have a (possibly wrong) default 628 $1="$4 $5" # we _must_ have a (possibly wrong) default
601 fi 629 fi
602 fi 630 fi
… …
629dnl 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)
630dnl AC_SUBST(rxvt_uint64_typedef) 658dnl AC_SUBST(rxvt_uint64_typedef)
631dnl# 659dnl#
632dnl# Now look for another we use 660dnl# Now look for another we use
633dnl# 661dnl#
634if test $ac_cv_sizeof_int_p -eq 8; then 662if test "$ac_cv_sizeof_int_p" -eq 8; then
635 rxvt_intp_define="#define intp_t int64_t" 663 rxvt_intp_define="#define intp_t int64_t"
636 rxvt_u_intp_define="#define u_intp_t u_int64_t" 664 rxvt_u_intp_define="#define u_intp_t u_int64_t"
637else 665else
638 if test $ac_cv_sizeof_int_p -eq 4; then 666 if test "$ac_cv_sizeof_int_p" -eq 4; then
639 rxvt_intp_define="#define intp_t int32_t" 667 rxvt_intp_define="#define intp_t int32_t"
640 rxvt_u_intp_define="#define u_intp_t u_int32_t" 668 rxvt_u_intp_define="#define u_intp_t u_int32_t"
641 else 669 else
642 if test $ac_cv_sizeof_int_p -eq 2; then 670 if test "$ac_cv_sizeof_int_p" -eq 2; then
643 rxvt_intp_define="#define intp_t int16_t" 671 rxvt_intp_define="#define intp_t int16_t"
644 rxvt_u_intp_define="#define u_intp_t u_int16_t" 672 rxvt_u_intp_define="#define u_intp_t u_int16_t"
645 else 673 else
646 rxvt_intp_define="#error set intp_t" 674 rxvt_intp_define="#error set intp_t"
647 rxvt_u_intp_define="#error set u_intp_t" 675 rxvt_u_intp_define="#error set u_intp_t"
… …
679 unlockpt \ 707 unlockpt \
680 isastream \ 708 isastream \
681 on_exit \ 709 on_exit \
682 nanosleep \ 710 nanosleep \
683 updwtmp \ 711 updwtmp \
712 updwtmpx \
684 ttyslot \ 713 ttyslot \
685) 714)
686dnl# 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
687 716
688dnl# -------------------------------------------------------------------------- 717dnl# --------------------------------------------------------------------------
… …
691dnl# check for host field in utmp structure 720dnl# check for host field in utmp structure
692 721
693dnl# -------------------------------------------- 722dnl# --------------------------------------------
694AC_CHECK_HEADER(utmp.h, 723AC_CHECK_HEADER(utmp.h,
695[AC_CACHE_CHECK([for struct utmp], rxvt_cv_struct_utmp, 724[AC_CACHE_CHECK([for struct utmp], rxvt_cv_struct_utmp,
696[AC_TRY_COMPILE([#include <sys/types.h> 725[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
697#include <stdint.h> 726#include <stdint.h>
698#include <utmp.h>], 727#include <utmp.h>]], [[struct utmp ut;]])],[rxvt_cv_struct_utmp=yes],[rxvt_cv_struct_utmp=no])])
699[struct utmp ut;],
700rxvt_cv_struct_utmp=yes, rxvt_cv_struct_utmp=no)])
701if test x$rxvt_cv_struct_utmp = xyes; then 728if test x$rxvt_cv_struct_utmp = xyes; then
702 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)
703fi 730fi
704] 731]
705 732
706AC_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,
707[AC_TRY_COMPILE([#include <sys/types.h> 734[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
708#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])])
709[struct utmp ut; ut.ut_host;],
710rxvt_cv_struct_utmp_host=yes, rxvt_cv_struct_utmp_host=no)])
711if test x$rxvt_cv_struct_utmp_host = xyes; then 736if test x$rxvt_cv_struct_utmp_host = xyes; then
712 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)
713fi 738fi
714 739
715AC_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,
716[AC_TRY_COMPILE([#include <sys/types.h> 741[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
717#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])])
718[struct utmp ut; ut.ut_pid;],
719rxvt_cv_struct_utmp_pid=yes, rxvt_cv_struct_utmp_pid=no)])
720if test x$rxvt_cv_struct_utmp_pid = xyes; then 743if test x$rxvt_cv_struct_utmp_pid = xyes; then
721 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)
722fi 745fi
723) dnl# AC_CHECK_HEADER(utmp.h 746) dnl# AC_CHECK_HEADER(utmp.h
724 747
725dnl# -------------------------------------------- 748dnl# --------------------------------------------
726 749
727AC_CHECK_HEADER(utmpx.h, 750AC_CHECK_HEADER(utmpx.h,
728[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,
729[AC_TRY_COMPILE([#include <sys/types.h> 767[AC_TRY_COMPILE([#include <sys/types.h>
730#include <utmpx.h>], 768#include <utmpx.h>],
731[struct utmpx ut;], 769[struct utmpx utx; utx.ut_session;],
732rxvt_cv_struct_utmpx=yes, rxvt_cv_struct_utmpx=no)]) 770rxvt_cv_struct_utmpx_session=yes, rxvt_cv_struct_utmpx_session=no)])
733if test x$rxvt_cv_struct_utmpx = xyes; then 771if test x$rxvt_cv_struct_utmpx_session = xyes; then
734 AC_DEFINE(HAVE_STRUCT_UTMPX, 1, Define if utmpx.h has struct utmpx)
735fi
736]
737
738AC_CACHE_CHECK(for host in utmpx struct, rxvt_cv_struct_utmpx_host,
739[AC_TRY_COMPILE([#include <sys/types.h>
740#include <utmpx.h>],
741[struct utmpx utx; utx.ut_host;],
742rxvt_cv_struct_utmpx_host=yes, rxvt_cv_struct_utmpx_host=no)])
743if test x$rxvt_cv_struct_utmpx_host = xyes; then
744 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)
745fi 773fi
746) dnl# AC_CHECK_HEADER(utmpx.h 774) dnl# AC_CHECK_HEADER(utmpx.h
747
748 775
749dnl# -------------------------------------------------------------------------- 776dnl# --------------------------------------------------------------------------
750dnl# check for struct lastlog 777dnl# check for struct lastlog
751AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog, 778AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog,
752[AC_TRY_COMPILE([#include <sys/types.h> 779[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
753#include <utmp.h> 780#include <utmp.h>
754#ifdef HAVE_LASTLOG_H 781#ifdef HAVE_LASTLOG_H
755#include <lastlog.h> 782#include <lastlog.h>
756#endif 783#endif
757],
758[struct lastlog ll;],
759rxvt_cv_struct_lastlog=yes, rxvt_cv_struct_lastlog=no)]) 784]], [[struct lastlog ll;]])],[rxvt_cv_struct_lastlog=yes],[rxvt_cv_struct_lastlog=no])])
760if test x$rxvt_cv_struct_lastlog = xyes; then 785if test x$rxvt_cv_struct_lastlog = xyes; then
761 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)
762fi 787fi
763 788
764dnl# check for struct lastlogx 789dnl# check for struct lastlogx
765AC_CACHE_CHECK(for struct lastlogx, rxvt_cv_struct_lastlogx, 790AC_CACHE_CHECK(for struct lastlogx, rxvt_cv_struct_lastlogx,
766[AC_TRY_COMPILE([#include <sys/types.h> 791[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
767#include <utmpx.h> 792#include <utmpx.h>
768#ifdef HAVE_LASTLOG_H 793#ifdef HAVE_LASTLOG_H
769#include <lastlog.h> 794#include <lastlog.h>
770#endif 795#endif
771],
772[struct lastlogx ll;],
773rxvt_cv_struct_lastlogx=yes, rxvt_cv_struct_lastlogx=no)]) 796]], [[struct lastlogx ll;]])],[rxvt_cv_struct_lastlogx=yes],[rxvt_cv_struct_lastlogx=no])])
774if test x$rxvt_cv_struct_lastlogx = xyes; then 797if test x$rxvt_cv_struct_lastlogx = xyes; then
775 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)
776fi 799fi
777 800
778dnl# -------------------------------------------------------------------------- 801dnl# --------------------------------------------------------------------------
779dnl# FIND FILES 802dnl# FIND FILES
780dnl# -------------------------------------------------------------------------- 803dnl# --------------------------------------------------------------------------
781 804
782dnl# find utmp 805dnl# find utmp
783AC_CACHE_CHECK(where utmp is located, rxvt_cv_path_utmp, 806AC_CACHE_CHECK(where utmp is located, rxvt_cv_path_utmp,
784[AC_TRY_RUN([#include <stdio.h> 807[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
785#include <sys/types.h> 808#include <sys/types.h>
786#include <utmp.h> 809#include <utmp.h>
787#include <errno.h> 810#include <errno.h>
788main() 811main()
789{ 812{
… …
804 fprintf(f, "%s\n", *u); 827 fprintf(f, "%s\n", *u);
805 exit(0); 828 exit(0);
806 } 829 }
807 } 830 }
808 exit(0); 831 exit(0);
809}], rxvt_cv_path_utmp=`cat conftestval`, rxvt_cv_path_utmp=, dnl 832}]])],[rxvt_cv_path_utmp=`cat conftestval`],[rxvt_cv_path_utmp=],[dnl
810 AC_MSG_WARN([Define RXVT_UTMP_FILE in config.h manually]))]) 833 AC_MSG_WARN(Define RXVT_UTMP_FILE in config.h manually)])])
811if test x$rxvt_cv_path_utmp != x; then 834if test x$rxvt_cv_path_utmp != x; then
812 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)
813fi 836fi
814 837
815dnl# -------------------------------------------------------------------------- 838dnl# --------------------------------------------------------------------------
816 839
817dnl# 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
818dnl# 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.
819AC_CACHE_CHECK(where utmpx is located, rxvt_cv_path_utmpx, 842AC_CACHE_CHECK(where utmpx is located, rxvt_cv_path_utmpx,
820[AC_TRY_RUN([#include <stdio.h> 843[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
821#include <sys/types.h> 844#include <sys/types.h>
822#include <utmpx.h> 845#include <utmpx.h>
823#include <errno.h> 846#include <errno.h>
824#include <sys/stat.h> 847#include <sys/stat.h>
825#ifdef HAVE_STRING_H 848#ifdef HAVE_STRING_H
… …
850 fprintf(f, "%s\n", *u); 873 fprintf(f, "%s\n", *u);
851 exit(0); 874 exit(0);
852 } 875 }
853 } 876 }
854 exit(0); 877 exit(0);
855}], rxvt_cv_path_utmpx=`cat conftestval`, rxvt_cv_path_utmpx=, dnl 878}]])],[rxvt_cv_path_utmpx=`cat conftestval`],[rxvt_cv_path_utmpx=],[dnl
856 AC_MSG_WARN([Define RXVT_UTMPX_FILE in config.h manually]))]) 879 AC_MSG_WARN(Define RXVT_UTMPX_FILE in config.h manually)])])
857if test x$rxvt_cv_path_utmpx != x; then 880if test x$rxvt_cv_path_utmpx != x; then
858 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)
859fi 882fi
860 883
861dnl# -------------------------------------------------------------------------- 884dnl# --------------------------------------------------------------------------
862 885
863dnl# find wtmp 886dnl# find wtmp
864AC_CACHE_CHECK(where wtmp is located, rxvt_cv_path_wtmp, 887AC_CACHE_CHECK(where wtmp is located, rxvt_cv_path_wtmp,
865[AC_TRY_RUN([#include <stdio.h> 888[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
866#include <sys/types.h> 889#include <sys/types.h>
867#ifdef HAVE_UTMP_H 890#ifdef HAVE_UTMP_H
868#include <utmp.h> 891#include <utmp.h>
869#endif 892#endif
870#include <errno.h> 893#include <errno.h>
… …
887 fprintf(f, "%s\n", *w); 910 fprintf(f, "%s\n", *w);
888 exit(0); 911 exit(0);
889 } 912 }
890 } 913 }
891 exit(0); 914 exit(0);
892}], rxvt_cv_path_wtmp=`cat conftestval`, rxvt_cv_path_wtmp=, dnl 915}]])],[rxvt_cv_path_wtmp=`cat conftestval`],[rxvt_cv_path_wtmp=],[dnl
893 AC_MSG_WARN([Define RXVT_WTMP_FILE in config.h manually]))]) 916 AC_MSG_WARN(Define RXVT_WTMP_FILE in config.h manually)])])
894if test x$rxvt_cv_path_wtmp != x; then 917if test x$rxvt_cv_path_wtmp != x; then
895 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)
896fi 919fi
897dnl# -------------------------------------------------------------------------- 920dnl# --------------------------------------------------------------------------
898 921
899dnl# find wtmpx 922dnl# find wtmpx
900AC_CACHE_CHECK(where wtmpx is located, rxvt_cv_path_wtmpx, 923AC_CACHE_CHECK(where wtmpx is located, rxvt_cv_path_wtmpx,
901[AC_TRY_RUN([#include <stdio.h> 924[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
902#ifdef HAVE_UTMPX_H 925#ifdef HAVE_UTMPX_H
903#include <utmpx.h> 926#include <utmpx.h>
904#endif 927#endif
905#include <errno.h> 928#include <errno.h>
906main() 929main()
… …
922 fprintf(f, "%s\n", *w); 945 fprintf(f, "%s\n", *w);
923 exit(0); 946 exit(0);
924 } 947 }
925 } 948 }
926 exit(0); 949 exit(0);
927}], rxvt_cv_path_wtmpx=`cat conftestval`, rxvt_cv_path_wtmpx=, dnl 950}]])],[rxvt_cv_path_wtmpx=`cat conftestval`],[rxvt_cv_path_wtmpx=],[dnl
928 AC_MSG_WARN([Define RXVT_WTMPX_FILE in config.h manually]))]) 951 AC_MSG_WARN(Define RXVT_WTMPX_FILE in config.h manually)])])
929if test x$rxvt_cv_path_wtmpx != x; then 952if test x$rxvt_cv_path_wtmpx != x; then
930 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)
931fi 954fi
932dnl# -------------------------------------------------------------------------- 955dnl# --------------------------------------------------------------------------
933 956
934dnl# find lastlog 957dnl# find lastlog
935AC_CACHE_CHECK(where lastlog is located, rxvt_cv_path_lastlog, 958AC_CACHE_CHECK(where lastlog is located, rxvt_cv_path_lastlog,
936[AC_TRY_RUN([#include <stdio.h> 959[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
937#include <sys/types.h> 960#include <sys/types.h>
938#ifdef HAVE_UTMPX_H 961#ifdef HAVE_UTMPX_H
939#include <utmpx.h> 962#include <utmpx.h>
940#elif defined(HAVE_UTMP_H) 963#elif defined(HAVE_UTMP_H)
941#include <utmp.h> 964#include <utmp.h>
… …
962 fprintf(f, "%s\n", *w); 985 fprintf(f, "%s\n", *w);
963 exit(0); 986 exit(0);
964 } 987 }
965 } 988 }
966 exit(0); 989 exit(0);
967}], rxvt_cv_path_lastlog=`cat conftestval`, rxvt_cv_path_lastlog=, dnl 990}]])],[rxvt_cv_path_lastlog=`cat conftestval`],[rxvt_cv_path_lastlog=],[dnl
968 AC_MSG_WARN([Define RXVT_LASTLOG_FILE in config.h manually]))]) 991 AC_MSG_WARN(Define RXVT_LASTLOG_FILE in config.h manually)])])
969if test x$rxvt_cv_path_lastlog != x; then 992if test x$rxvt_cv_path_lastlog != x; then
970 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)
971 if test -d "$rxvt_cv_path_lastlog"; then 994 if test -d "$rxvt_cv_path_lastlog"; then
972 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)
973 fi 996 fi
974fi 997fi
975dnl# -------------------------------------------------------------------------- 998dnl# --------------------------------------------------------------------------
976 999
977dnl# find lastlogx 1000dnl# find lastlogx
978AC_CACHE_CHECK(where lastlogx is located, rxvt_cv_path_lastlogx, 1001AC_CACHE_CHECK(where lastlogx is located, rxvt_cv_path_lastlogx,
979[AC_TRY_RUN([#include <stdio.h> 1002[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
980#ifdef HAVE_UTMPX_H 1003#ifdef HAVE_UTMPX_H
981#include <utmpx.h> 1004#include <utmpx.h>
982#endif 1005#endif
983#include <errno.h> 1006#include <errno.h>
984main() 1007main()
… …
999 fprintf(f, "%s\n", *w); 1022 fprintf(f, "%s\n", *w);
1000 exit(0); 1023 exit(0);
1001 } 1024 }
1002 } 1025 }
1003 exit(0); 1026 exit(0);
1004}], rxvt_cv_path_lastlogx=`cat conftestval`, rxvt_cv_path_lastlogx=, dnl 1027}]])],[rxvt_cv_path_lastlogx=`cat conftestval`],[rxvt_cv_path_lastlogx=],[dnl
1005 AC_MSG_WARN([Define RXVT_LASTLOGX_FILE in config.h manually]))]) 1028 AC_MSG_WARN(Define RXVT_LASTLOGX_FILE in config.h manually)])])
1006if test x$rxvt_cv_path_lastlogx != x; then 1029if test x$rxvt_cv_path_lastlogx != x; then
1007 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)
1008fi 1031fi
1009 1032
1010dnl# -------------------------------------------------------------------------- 1033dnl# --------------------------------------------------------------------------
… …
1034LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 1057LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
1035if 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
1036 LIBS=`echo $LIBS | sed "$R_TRANSLATE"` 1059 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
1037fi 1060fi
1038AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 1061AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
1039[AC_TRY_RUN([#include <X11/Xlib.h> 1062[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
1040main() { 1063main() {
1041char *p; 1064char *p;
1042if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 1065if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
1043exit (XSupportsLocale() ? 0 : 1); 1066exit (XSupportsLocale() ? 0 : 1);
1044else 1067else
1045exit (1);}], dnl 1068exit (1);}]])],[dnl
1046 rxvt_cv_func_xlocale=yes, rxvt_cv_func_xlocale=no, dnl 1069 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
1047 AC_MSG_WARN([Define NO_XLOCALE in config.h manually]))]) 1070 AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])])
1048if test x$rxvt_cv_func_xlocale = xyes; then 1071if test x$rxvt_cv_func_xlocale = xyes; then
1049 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works) 1072 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works)
1050fi 1073fi
1051 1074
1052AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, 1075AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
1053[AC_TRY_LINK([#define X_LOCALE 1 1076[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
1054#include <X11/Xlocale.h>], 1077#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
1055 [setlocale(LC_CTYPE, "");],
1056 rxvt_cv_func_xsetlocale=yes, rxvt_cv_func_xsetlocale=no)])
1057if test x$rxvt_cv_func_xsetlocale = xyes; then 1078if test x$rxvt_cv_func_xsetlocale = xyes; then
1058 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)
1059fi 1080fi
1060LIBS=$ac_save_LIBS 1081LIBS=$ac_save_LIBS
1061CFLAGS=$ac_save_CFLAGS 1082CFLAGS=$ac_save_CFLAGS
1062 1083
1063AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale, 1084AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
1064[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])])
1065 [setlocale(LC_CTYPE, "");],
1066 rxvt_cv_func_setlocale=yes, rxvt_cv_func_setlocale=no)])
1067if test x$rxvt_cv_func_setlocale = xyes; then 1086if test x$rxvt_cv_func_setlocale = xyes; then
1068 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works) 1087 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
1069fi 1088fi
1070 1089
1071AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo, 1090AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,
1072[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])])
1073 [nl_langinfo(CODESET);],
1074 rxvt_cv_func_nl_langinfo=yes, rxvt_cv_func_nl_langinfo=no)])
1075if test x$rxvt_cv_func_nl_langinfo = xyes; then 1092if test x$rxvt_cv_func_nl_langinfo = xyes; then
1076 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)
1077fi 1094fi
1078 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
1079AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt, 1112AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt,
1080[AC_TRY_LINK([#define _GNU_SOURCE 1113[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define _GNU_SOURCE
1081#ifdef HAVE_STDLIB_H 1114#ifdef HAVE_STDLIB_H
1082# include <cstdlib> 1115# include <cstdlib>
1083#endif], 1116#endif]], [[(void)getpt();]])],[rxvt_cv_func_getpt=yes],[rxvt_cv_func_getpt=no])])
1084 [(void)getpt();],
1085 rxvt_cv_func_getpt=yes, rxvt_cv_func_getpt=no)])
1086if test x$rxvt_cv_func_getpt = xyes; then 1117if test x$rxvt_cv_func_getpt = xyes; then
1087 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() )
1088fi 1119fi
1089 1120
1090dnl# 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
… …
1148if 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
1149 AC_DEFINE(PTYS_ARE_SEARCHED, 1, Define for this pty type) 1180 AC_DEFINE(PTYS_ARE_SEARCHED, 1, Define for this pty type)
1150fi 1181fi
1151 1182
1152 1183
1153AC_CHECKING(for pty ranges) 1184AS_MESSAGE(checking for pty ranges...)
1154ptys=`echo /dev/pty??` 1185ptys=`echo /dev/pty??`
1155pch1=`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'`
1156pch2=`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'`
1157if test x$pch1 != x; then 1188if test x$pch1 != x; then
1158 AC_DEFINE_UNQUOTED(PTYCHAR1, "$pch1", Define for first char in devptyXX) 1189 AC_DEFINE_UNQUOTED(PTYCHAR1, "$pch1", Define for first char in devptyXX)
… …
1162fi 1193fi
1163 1194
1164dnl# -------------------------------------------------------------------------- 1195dnl# --------------------------------------------------------------------------
1165dnl# now add and remove other stuff 1196dnl# now add and remove other stuff
1166dnl# -------------------------------------------------------------------------- 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
1167if test x$support_tinting = xyes; then 1222if test x$support_tinting = xyes; then
1168 AC_DEFINE(TINTING, 1, Define if you want your background to be tinted) 1223 AC_DEFINE(TINTING, 1, Define if you want your background to be tinted)
1169fi 1224fi
1170if test x$support_inheritpixmap = xyes; then 1225if test x$support_inheritpixmap = xyes; then
1171 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)
… …
1177 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)
1178fi 1233fi
1179if test x$support_menubar = xyes; then 1234if test x$support_menubar = xyes; then
1180 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support) 1235 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support)
1181fi 1236fi
1182if test x$support_frills = xno; then 1237if test x$support_frills = xyes; then
1183 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)
1184fi
1185if test x$support_linespace = xno; then
1186 AC_DEFINE(NO_LINESPACE, 1, Define if you don't want support linespace)
1187fi 1239fi
1188if test x$support_24bit = xyes; then 1240if test x$support_24bit = xyes; then
1189 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)
1190fi 1242fi
1191if test x$support_mousewheel = xyes; then 1243if test x$support_mousewheel = xyes; then
… …
1241fi 1293fi
1242if test x$support_combining = xyes; then 1294if test x$support_combining = xyes; then
1243 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)
1244fi 1296fi
1245if test x$codesets = xall; then 1297if test x$codesets = xall; then
1246 codesets=jp,jp-ext,kr,cn,cn-ext 1298 codesets=jp,jp-ext,kr,zh,zh-ext
1247fi 1299fi
1300AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
1301AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
1248for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do 1302for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do
1249 AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
1250 AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
1251 case "$codeset" in 1303 case "$codeset" in
1252 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) ;;
1253 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) ;;
1254 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) ;;
1255 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) ;;
1256 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) ;;
1257 esac 1309 esac
1258done 1310done
1259 1311
1260dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket) 1312dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket)
1261 1313
… …
1316RXVT_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)
1317RXVT_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)
1318RXVT_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)
1319RXVT_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)
1320 1372
1321if test x$support_xft = xyes; then
1322 LIBS="$LIBS `pkg-config xft --libs`"
1323 CFLAGS="$CFLAGS `pkg-config xft --cflags`"
1324 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
1325
1326 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
1327 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
1328
1329 if test x$support_xft = xyes; then
1330 AC_DEFINE(XFT, 1, Define to enable xft support)
1331 fi
1332fi
1333
1334AC_OUTPUT(autoconf/Make.common \ 1373AC_CONFIG_FILES([autoconf/Make.common \
1335Makefile \ 1374Makefile \
1336doc/Makefile \ 1375doc/Makefile \
1337src/Makefile \ 1376src/Makefile \
1338src/test/Makefile \
1339src/rxvtlib.h \ 1377src/rxvtlib.h \
1340W11/Makefile \ 1378])
1341) 1379AC_OUTPUT
1342 1380
1343echo "Configuration: 1381echo "Configuration:
1344 1382
1345 Rxvt version: $VERSION : $DATE 1383 Rxvt version: $VERSION : $DATE
1346 Source code location: $srcdir 1384 Source code location: $srcdir

Diff Legend

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