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.30 by root, Fri Jul 30 16:04:05 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.)
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
73support_fading=no 95support_fading=no
74support_keepscrolling=no 96support_keepscrolling=no
75support_selectionscrolling=no 97support_selectionscrolling=no
… …
90support_xpm=no 112support_xpm=no
91support_xft=no 113support_xft=no
92support_unicode3=no 114support_unicode3=no
93support_combining=no 115support_combining=no
94support_8bitctrls=no 116support_8bitctrls=no
117support_iso14755=no
118support_styles=no
95codesets= 119codesets=
96 120
97dnl# -------------------------------------------------------------------------- 121dnl# --------------------------------------------------------------------------
98dnl# CHECKING COMMAND LINE OPTIONS 122dnl# CHECKING COMMAND LINE OPTIONS
99dnl# -------------------------------------------------------------------------- 123dnl# --------------------------------------------------------------------------
… …
109 NOTE: this option is order dependent 133 NOTE: this option is order dependent
110 NOTE: automatically enabled with --enable-shared], 134 NOTE: automatically enabled with --enable-shared],
111 [if test x$enableval = xyes; then 135 [if test x$enableval = xyes; then
112 support_24bit=yes 136 support_24bit=yes
113 support_frills=yes 137 support_frills=yes
114 support_linespace=yes
115 support_inheritpixmap=yes 138 support_inheritpixmap=yes
116 support_tinting=yes 139 support_tinting=yes
117 support_fading=yes 140 support_fading=yes
118 support_keepscrolling=yes 141 support_keepscrolling=yes
119 support_selectionscrolling=yes 142 support_selectionscrolling=yes
… …
134 support_xpm=yes 157 support_xpm=yes
135 support_xft=yes 158 support_xft=yes
136 support_unicode3=yes 159 support_unicode3=yes
137 support_combining=yes 160 support_combining=yes
138 #support_8bitctrls=yes 161 #support_8bitctrls=yes
162 support_iso14755=yes
163 support_styles=yes
139 codesets=all 164 codesets=all
140 fi]) 165 fi])
141 166
142AC_ARG_ENABLE(unicode3, 167AC_ARG_ENABLE(unicode3,
143 [ --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],
144 [if test x$enableval = xyes -o x$enableval = xno; then 169 [if test x$enableval = xyes -o x$enableval = xno; then
145 support_unicode3=yes 170 support_unicode3=$enableval
146 fi]) 171 fi])
147 172
148AC_ARG_ENABLE(combining, 173AC_ARG_ENABLE(combining,
149 [ --enable-combining enable composition of base and combining characters], 174 [ --enable-combining enable composition of base and combining characters],
150 [if test x$enableval = xyes -o x$enableval = xno; then 175 [if test x$enableval = xyes -o x$enableval = xno; then
151 support_combining=yes 176 support_combining=$enableval
152 fi]) 177 fi])
153 178
154AC_ARG_ENABLE(xft, 179AC_ARG_ENABLE(xft,
155 [ --enable-xft enable xft support on systems that have it], 180 [ --enable-xft enable xft support on systems that have it],
156 [if test x$enableval = xyes -o x$enableval = xno; then 181 [if test x$enableval = xyes -o x$enableval = xno; then
157 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
158 fi]) 189 fi])
159 190
160AC_ARG_ENABLE(utmp, 191AC_ARG_ENABLE(utmp,
161 [ --enable-utmp enable utmp (utmpx) support], 192 [ --enable-utmp enable utmp (utmpx) support],
162 [if test x$enableval = xyes -o x$enableval = xno; then 193 [if test x$enableval = xyes -o x$enableval = xno; then
… …
234 [if test x$enableval = xyes; then 265 [if test x$enableval = xyes; then
235 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)
236 fi]) 267 fi])
237 268
238AC_ARG_WITH(codesets, 269AC_ARG_WITH(codesets,
239 [ --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)],
240 [codesets="$withval"]) 271 [codesets="$withval"])
241 272
242AC_ARG_ENABLE(xim, 273AC_ARG_ENABLE(xim,
243 [ --enable-xim XIM (X Input Method) protocol support], 274 [ --enable-xim XIM (X Input Method) protocol support],
244 [if test x$enableval = xyes -o x$enableval = xno; then 275 [if test x$enableval = xyes -o x$enableval = xno; then
… …
276 fi]) 307 fi])
277 308
278AC_ARG_ENABLE(8bitctrls, 309AC_ARG_ENABLE(8bitctrls,
279 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)], 310 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)],
280 [if test x$enableval = xyes -o x$enableval = xno; then 311 [if test x$enableval = xyes -o x$enableval = xno; then
281 support_8bitctrls=yes 312 support_8bitctrls=$enableval
282 fi]) 313 fi])
283 314
284RESFALLBACK=Rxvt 315RESFALLBACK=Rxvt
285AC_ARG_ENABLE(fallback, 316AC_ARG_ENABLE(fallback,
286 [ --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)],
… …
308 339
309RXVTNAME=urxvt 340RXVTNAME=urxvt
310AC_ARG_WITH(name, 341AC_ARG_WITH(name,
311 [ --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)],
312 [RXVTNAME="$withval"]) 343 [RXVTNAME="$withval"])
344AC_DEFINE_UNQUOTED(RXVTNAME,"$RXVTNAME", [Binary base name])
313 345
314RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"` 346RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"`
315AC_SUBST(RXVTNAME) 347AC_SUBST(RXVTNAME)
316 348
317AC_ARG_ENABLE(strings, 349AC_ARG_ENABLE(strings,
… …
324 [ --disable-swapscreen disable swap screen support], 356 [ --disable-swapscreen disable swap screen support],
325 [if test x$enableval = xno; then 357 [if test x$enableval = xno; then
326 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)
327 fi]) 359 fi])
328 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
329AC_ARG_ENABLE(frills, 367AC_ARG_ENABLE(frills,
330 [ --enable-frills enable support for rarely used features], 368 [ --enable-frills enable support for rarely used features],
331 [if test x$enableval = xyes -o x$enableval = xno; then 369 [if test x$enableval = xyes -o x$enableval = xno; then
332 support_frills=$enableval 370 support_frills=$enableval
333 fi])
334
335AC_ARG_ENABLE(linespace,
336 [ --enable-linespace enable support for linespace],
337 [if test x$enableval = xyes -o x$enableval = xno; then
338 support_linespace=$enableval
339 fi]) 371 fi])
340 372
341AC_ARG_ENABLE(24bit, 373AC_ARG_ENABLE(24bit,
342 [ --enable-24bit enable support for using 24bit visuals if available], 374 [ --enable-24bit enable support for using 24bit visuals if available],
343 [if test x$enableval = xyes -o x$enableval = xno; then 375 [if test x$enableval = xyes -o x$enableval = xno; then
… …
391 [ --enable-smart-resize enable smart growth/shrink behaviour], 423 [ --enable-smart-resize enable smart growth/shrink behaviour],
392 [if test x$enableval = xyes; then 424 [if test x$enableval = xyes; then
393 AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior) 425 AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior)
394 fi]) 426 fi])
395 427
396AC_ARG_ENABLE(256-color,
397 [ --enable-256-color enable 256-color support],
398 [if test x$enableval = xyes; then
399 AC_DEFINE(TTY_256COLOR, 1, Define if you want 256 colour support)
400 fi])
401
402AC_ARG_ENABLE(cursor-blink, 428AC_ARG_ENABLE(cursor-blink,
403 [ --enable-cursor-blink enable blinking cursor], 429 [ --enable-cursor-blink enable blinking cursor],
404 [if test x$enableval = xyes -o x$enableval = xno; then 430 [if test x$enableval = xyes -o x$enableval = xno; then
405 support_cursor_blink=$enableval 431 support_cursor_blink=$enableval
406 fi]) 432 fi])
… …
430 fi]) 456 fi])
431 457
432dnl# -------------------------------------------------------------------------- 458dnl# --------------------------------------------------------------------------
433 459
434AC_DEFINE(PROTOTYPES, 1, Define if you need function prototypes) 460AC_DEFINE(PROTOTYPES, 1, Define if you need function prototypes)
435
436dnl# --------------------------------------------------------------------------
437dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
438dnl#
439if test -z "$CFLAGS"; then
440 if test -z "$CCOPTS"; then
441 CCOPTS='-O'
442dnl> if test "x$GCC" = xyes; then
443dnl> if test x$system = xLinux; then
444dnl> CCOPTS="$CCOPTS "'-O2 -fno-strength-reduce'
445dnl> fi
446dnl> fi
447 fi
448 CFLAGS="$CCOPTS"
449fi
450 461
451AC_PATH_PROG(MV, mv, mv) 462AC_PATH_PROG(MV, mv, mv)
452AC_PATH_PROG(RM, rm, rm) 463AC_PATH_PROG(RM, rm, rm)
453AC_PATH_PROG(CP, cp, cp) 464AC_PATH_PROG(CP, cp, cp)
454AC_PATH_PROG(LN, ln, ln) 465AC_PATH_PROG(LN, ln, ln)
455AC_PATH_PROG(SED, sed, sed) 466AC_PATH_PROG(SED, sed, sed)
456AC_PATH_PROG(ECHO, echo, echo) 467AC_PATH_PROG(ECHO, echo, echo)
457AC_PATH_PROG(CMP, cmp, cmp) 468AC_PATH_PROG(CMP, cmp, cmp)
458AC_PATH_PROG(TBL, tbl) 469AC_PATH_PROG(TBL, tbl)
470AC_PATH_PROG(TIC, tic)
459 471
460dnl# need a neat way to detect SVR4 or its features 472dnl# need a neat way to detect SVR4 or its features
461dnl# in src/command.c we use these functions: 473dnl# in src/command.c we use these functions:
462dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> 474dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
463dnl# - but are these also defined for other systems? 475dnl# - but are these also defined for other systems?
… …
500 sys/byteorder.h \ 512 sys/byteorder.h \
501 sys/ioctl.h \ 513 sys/ioctl.h \
502 sys/select.h \ 514 sys/select.h \
503 sys/sockio.h \ 515 sys/sockio.h \
504 sys/strredir.h \ 516 sys/strredir.h \
517 sys/stropts.h \
505 sys/time.h \ 518 sys/time.h \
506 utmp.h \ 519 utmp.h \
507 utmpx.h \ 520 utmpx.h \
508 stdint.h \ 521 stdint.h \
522 pty.h \
523 wchar.h \
524 cwchar \
525 clocale \
509) 526)
510 527
511AC_HEADER_TIME 528AC_HEADER_TIME
512 529
513dnl# check to allow both <termios.h> and <sys/ioctl.h> 530dnl# check to allow both <termios.h> and <sys/ioctl.h>
514AC_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,
515[AC_TRY_COMPILE([#include <stdio.h> 532[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
516#include <sys/ioctl.h> 533#include <sys/ioctl.h>
517#ifdef HAVE_TERMIOS_H 534#ifdef HAVE_TERMIOS_H
518#include <termios.h> 535#include <termios.h>
519#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])])
520 537
521dnl# ELF systems may want to store paths for dynamic libraries. 538dnl# ELF systems may want to store paths for dynamic libraries.
522dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath" 539dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath"
523dnl# 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.
524if test -n "$GCC"; then 541if test -n "$GCC"; then
… …
533ac_save_CFLAGS=$CFLAGS 550ac_save_CFLAGS=$CFLAGS
534ac_save_LIBS=$LIBS 551ac_save_LIBS=$LIBS
535CFLAGS="$CFLAGS $X_CFLAGS" 552CFLAGS="$CFLAGS $X_CFLAGS"
536LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` 553LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
537AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath, 554AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath,
538[AC_TRY_RUN([ 555[AC_RUN_IFELSE([AC_LANG_SOURCE([[
539main() 556main()
540{ 557{
541 exit(0); 558 exit(0);
542 (void) XOpenDisplay("foobar"); 559 (void) XOpenDisplay("foobar");
543}], rxvt_cv_rpath=yes, rxvt_cv_rpath=no, dnl 560}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
544 AC_MSG_WARN([You may need to check the LIBS line]))]) 561 AC_MSG_WARN(You may need to check the LIBS line)])])
545if test x$rxvt_cv_rpath != xyes; then 562if test x$rxvt_cv_rpath != xyes; then
546 changequote(, )dnl 563 changequote(, )dnl
547 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g' 564 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
548 changequote([, ])dnl 565 changequote([, ])dnl
549 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"`
550 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,
551[AC_TRY_RUN([ 568[AC_RUN_IFELSE([AC_LANG_SOURCE([[
552main() 569main()
553{ 570{
554 exit(0); 571 exit(0);
555 (void) XOpenDisplay("foobar"); 572 (void) XOpenDisplay("foobar");
556}], 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])])
557 if test x$rxvt_cv_R != xyes; then 574 if test x$rxvt_cv_R != xyes; then
558 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 575 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
559 fi 576 fi
560fi 577fi
561 578
562AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 579AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
563[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])])
564rxvt_cv_xpointer=yes, rxvt_cv_xpointer=no)])
565if test x$rxvt_cv_xpointer = xyes; then 581if test x$rxvt_cv_xpointer = xyes; then
566 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 582 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
567fi 583fi
568LIBS=$ac_save_LIBS 584LIBS=$ac_save_LIBS
569CFLAGS=$ac_save_CFLAGS 585CFLAGS=$ac_save_CFLAGS
… …
582dnl> AC_CHECK_TYPE(umode_t, int) 598dnl> AC_CHECK_TYPE(umode_t, int)
583dnl> AC_CHECK_TYPE(off_t, long) 599dnl> AC_CHECK_TYPE(off_t, long)
584AC_TYPE_PID_T 600AC_TYPE_PID_T
585AC_TYPE_UID_T 601AC_TYPE_UID_T
586 602
587
588AC_CHECK_SIZEOF(char, 1)
589AC_CHECK_SIZEOF(short, 2) 603AC_CHECK_SIZEOF(short, 2)
590AC_CHECK_SIZEOF(int, 4) 604AC_CHECK_SIZEOF(int, 4)
591AC_CHECK_SIZEOF(long, 4) 605dnl AC_CHECK_SIZEOF(long, 4)
592AC_CHECK_SIZEOF(long long, 8) 606AC_CHECK_SIZEOF(long long, 8)
593AC_CHECK_SIZEOF(int *, 4) 607AC_CHECK_SIZEOF(int *, 4)
594 608
595dnl# see usage below 609dnl# see usage below
596AC_DEFUN(RXVT_CHECK_SIZE, 610AC_DEFUN(RXVT_CHECK_SIZE,
597 [AC_CACHE_CHECK([for $2], $1, 611 [AC_CACHE_CHECK([for $2], $1,
598 [AC_TRY_COMPILE([#include <stdint.h>], $2 dummy;, 612 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl
599 [$1=yes],
600 [dnl
601if test $ac_cv_sizeof_char -ge $3; then 613if test "$ac_cv_sizeof_char" -ge $3; then
602 $1="$4 char" 614 $1="$4 char"
603else 615else
604 if test $ac_cv_sizeof_short -ge $3; then 616 if test "$ac_cv_sizeof_short" -ge $3; then
605 $1="$4 short" 617 $1="$4 short"
606 else 618 else
607 if test $ac_cv_sizeof_int -ge $3; then 619 if test "$ac_cv_sizeof_int" -ge $3; then
608 $1="$4 int" 620 $1="$4 int"
609 else 621 else
610 if test $ac_cv_sizeof_long -ge $3; then 622 if test "$ac_cv_sizeof_long" -ge $3; then
611 $1="$4 long" 623 $1="$4 long"
612 else 624 else
613 if test $ac_cv_sizeof_long_long -ge $3; then 625 if test "$ac_cv_sizeof_long_long" -ge $3; then
614 $1="$4 long long" 626 $1="$4 long long"
615 else 627 else
616 $1="$4 $5" # we _must_ have a (possibly wrong) default 628 $1="$4 $5" # we _must_ have a (possibly wrong) default
617 fi 629 fi
618 fi 630 fi
… …
645dnl 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)
646dnl AC_SUBST(rxvt_uint64_typedef) 658dnl AC_SUBST(rxvt_uint64_typedef)
647dnl# 659dnl#
648dnl# Now look for another we use 660dnl# Now look for another we use
649dnl# 661dnl#
650if test $ac_cv_sizeof_int_p -eq 8; then 662if test "$ac_cv_sizeof_int_p" -eq 8; then
651 rxvt_intp_define="#define intp_t int64_t" 663 rxvt_intp_define="#define intp_t int64_t"
652 rxvt_u_intp_define="#define u_intp_t u_int64_t" 664 rxvt_u_intp_define="#define u_intp_t u_int64_t"
653else 665else
654 if test $ac_cv_sizeof_int_p -eq 4; then 666 if test "$ac_cv_sizeof_int_p" -eq 4; then
655 rxvt_intp_define="#define intp_t int32_t" 667 rxvt_intp_define="#define intp_t int32_t"
656 rxvt_u_intp_define="#define u_intp_t u_int32_t" 668 rxvt_u_intp_define="#define u_intp_t u_int32_t"
657 else 669 else
658 if test $ac_cv_sizeof_int_p -eq 2; then 670 if test "$ac_cv_sizeof_int_p" -eq 2; then
659 rxvt_intp_define="#define intp_t int16_t" 671 rxvt_intp_define="#define intp_t int16_t"
660 rxvt_u_intp_define="#define u_intp_t u_int16_t" 672 rxvt_u_intp_define="#define u_intp_t u_int16_t"
661 else 673 else
662 rxvt_intp_define="#error set intp_t" 674 rxvt_intp_define="#error set intp_t"
663 rxvt_u_intp_define="#error set u_intp_t" 675 rxvt_u_intp_define="#error set u_intp_t"
… …
695 unlockpt \ 707 unlockpt \
696 isastream \ 708 isastream \
697 on_exit \ 709 on_exit \
698 nanosleep \ 710 nanosleep \
699 updwtmp \ 711 updwtmp \
712 updwtmpx \
700 ttyslot \ 713 ttyslot \
701) 714)
702dnl# 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
703 716
704dnl# -------------------------------------------------------------------------- 717dnl# --------------------------------------------------------------------------
… …
707dnl# check for host field in utmp structure 720dnl# check for host field in utmp structure
708 721
709dnl# -------------------------------------------- 722dnl# --------------------------------------------
710AC_CHECK_HEADER(utmp.h, 723AC_CHECK_HEADER(utmp.h,
711[AC_CACHE_CHECK([for struct utmp], rxvt_cv_struct_utmp, 724[AC_CACHE_CHECK([for struct utmp], rxvt_cv_struct_utmp,
712[AC_TRY_COMPILE([#include <sys/types.h> 725[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
713#include <stdint.h> 726#include <stdint.h>
714#include <utmp.h>], 727#include <utmp.h>]], [[struct utmp ut;]])],[rxvt_cv_struct_utmp=yes],[rxvt_cv_struct_utmp=no])])
715[struct utmp ut;],
716rxvt_cv_struct_utmp=yes, rxvt_cv_struct_utmp=no)])
717if test x$rxvt_cv_struct_utmp = xyes; then 728if test x$rxvt_cv_struct_utmp = xyes; then
718 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)
719fi 730fi
720] 731]
721 732
722AC_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,
723[AC_TRY_COMPILE([#include <sys/types.h> 734[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
724#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])])
725[struct utmp ut; ut.ut_host;],
726rxvt_cv_struct_utmp_host=yes, rxvt_cv_struct_utmp_host=no)])
727if test x$rxvt_cv_struct_utmp_host = xyes; then 736if test x$rxvt_cv_struct_utmp_host = xyes; then
728 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)
729fi 738fi
730 739
731AC_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,
732[AC_TRY_COMPILE([#include <sys/types.h> 741[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
733#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])])
734[struct utmp ut; ut.ut_pid;],
735rxvt_cv_struct_utmp_pid=yes, rxvt_cv_struct_utmp_pid=no)])
736if test x$rxvt_cv_struct_utmp_pid = xyes; then 743if test x$rxvt_cv_struct_utmp_pid = xyes; then
737 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)
738fi 745fi
739) dnl# AC_CHECK_HEADER(utmp.h 746) dnl# AC_CHECK_HEADER(utmp.h
740 747
741dnl# -------------------------------------------- 748dnl# --------------------------------------------
742 749
743AC_CHECK_HEADER(utmpx.h, 750AC_CHECK_HEADER(utmpx.h,
744[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,
745[AC_TRY_COMPILE([#include <sys/types.h> 767[AC_TRY_COMPILE([#include <sys/types.h>
746#include <utmpx.h>], 768#include <utmpx.h>],
747[struct utmpx ut;], 769[struct utmpx utx; utx.ut_session;],
748rxvt_cv_struct_utmpx=yes, rxvt_cv_struct_utmpx=no)]) 770rxvt_cv_struct_utmpx_session=yes, rxvt_cv_struct_utmpx_session=no)])
749if test x$rxvt_cv_struct_utmpx = xyes; then 771if test x$rxvt_cv_struct_utmpx_session = xyes; then
750 AC_DEFINE(HAVE_STRUCT_UTMPX, 1, Define if utmpx.h has struct utmpx)
751fi
752]
753
754AC_CACHE_CHECK(for host in utmpx struct, rxvt_cv_struct_utmpx_host,
755[AC_TRY_COMPILE([#include <sys/types.h>
756#include <utmpx.h>],
757[struct utmpx utx; utx.ut_host;],
758rxvt_cv_struct_utmpx_host=yes, rxvt_cv_struct_utmpx_host=no)])
759if test x$rxvt_cv_struct_utmpx_host = xyes; then
760 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)
761fi 773fi
762) dnl# AC_CHECK_HEADER(utmpx.h 774) dnl# AC_CHECK_HEADER(utmpx.h
763
764 775
765dnl# -------------------------------------------------------------------------- 776dnl# --------------------------------------------------------------------------
766dnl# check for struct lastlog 777dnl# check for struct lastlog
767AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog, 778AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog,
768[AC_TRY_COMPILE([#include <sys/types.h> 779[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
769#include <utmp.h> 780#include <utmp.h>
770#ifdef HAVE_LASTLOG_H 781#ifdef HAVE_LASTLOG_H
771#include <lastlog.h> 782#include <lastlog.h>
772#endif 783#endif
773],
774[struct lastlog ll;],
775rxvt_cv_struct_lastlog=yes, rxvt_cv_struct_lastlog=no)]) 784]], [[struct lastlog ll;]])],[rxvt_cv_struct_lastlog=yes],[rxvt_cv_struct_lastlog=no])])
776if test x$rxvt_cv_struct_lastlog = xyes; then 785if test x$rxvt_cv_struct_lastlog = xyes; then
777 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)
778fi 787fi
779 788
780dnl# check for struct lastlogx 789dnl# check for struct lastlogx
781AC_CACHE_CHECK(for struct lastlogx, rxvt_cv_struct_lastlogx, 790AC_CACHE_CHECK(for struct lastlogx, rxvt_cv_struct_lastlogx,
782[AC_TRY_COMPILE([#include <sys/types.h> 791[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
783#include <utmpx.h> 792#include <utmpx.h>
784#ifdef HAVE_LASTLOG_H 793#ifdef HAVE_LASTLOG_H
785#include <lastlog.h> 794#include <lastlog.h>
786#endif 795#endif
787],
788[struct lastlogx ll;],
789rxvt_cv_struct_lastlogx=yes, rxvt_cv_struct_lastlogx=no)]) 796]], [[struct lastlogx ll;]])],[rxvt_cv_struct_lastlogx=yes],[rxvt_cv_struct_lastlogx=no])])
790if test x$rxvt_cv_struct_lastlogx = xyes; then 797if test x$rxvt_cv_struct_lastlogx = xyes; then
791 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)
792fi 799fi
793 800
794dnl# -------------------------------------------------------------------------- 801dnl# --------------------------------------------------------------------------
795dnl# FIND FILES 802dnl# FIND FILES
796dnl# -------------------------------------------------------------------------- 803dnl# --------------------------------------------------------------------------
797 804
798dnl# find utmp 805dnl# find utmp
799AC_CACHE_CHECK(where utmp is located, rxvt_cv_path_utmp, 806AC_CACHE_CHECK(where utmp is located, rxvt_cv_path_utmp,
800[AC_TRY_RUN([#include <stdio.h> 807[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
801#include <sys/types.h> 808#include <sys/types.h>
802#include <utmp.h> 809#include <utmp.h>
803#include <errno.h> 810#include <errno.h>
804main() 811main()
805{ 812{
… …
820 fprintf(f, "%s\n", *u); 827 fprintf(f, "%s\n", *u);
821 exit(0); 828 exit(0);
822 } 829 }
823 } 830 }
824 exit(0); 831 exit(0);
825}], rxvt_cv_path_utmp=`cat conftestval`, rxvt_cv_path_utmp=, dnl 832}]])],[rxvt_cv_path_utmp=`cat conftestval`],[rxvt_cv_path_utmp=],[dnl
826 AC_MSG_WARN([Define RXVT_UTMP_FILE in config.h manually]))]) 833 AC_MSG_WARN(Define RXVT_UTMP_FILE in config.h manually)])])
827if test x$rxvt_cv_path_utmp != x; then 834if test x$rxvt_cv_path_utmp != x; then
828 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)
829fi 836fi
830 837
831dnl# -------------------------------------------------------------------------- 838dnl# --------------------------------------------------------------------------
832 839
833dnl# 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
834dnl# 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.
835AC_CACHE_CHECK(where utmpx is located, rxvt_cv_path_utmpx, 842AC_CACHE_CHECK(where utmpx is located, rxvt_cv_path_utmpx,
836[AC_TRY_RUN([#include <stdio.h> 843[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
837#include <sys/types.h> 844#include <sys/types.h>
838#include <utmpx.h> 845#include <utmpx.h>
839#include <errno.h> 846#include <errno.h>
840#include <sys/stat.h> 847#include <sys/stat.h>
841#ifdef HAVE_STRING_H 848#ifdef HAVE_STRING_H
… …
866 fprintf(f, "%s\n", *u); 873 fprintf(f, "%s\n", *u);
867 exit(0); 874 exit(0);
868 } 875 }
869 } 876 }
870 exit(0); 877 exit(0);
871}], rxvt_cv_path_utmpx=`cat conftestval`, rxvt_cv_path_utmpx=, dnl 878}]])],[rxvt_cv_path_utmpx=`cat conftestval`],[rxvt_cv_path_utmpx=],[dnl
872 AC_MSG_WARN([Define RXVT_UTMPX_FILE in config.h manually]))]) 879 AC_MSG_WARN(Define RXVT_UTMPX_FILE in config.h manually)])])
873if test x$rxvt_cv_path_utmpx != x; then 880if test x$rxvt_cv_path_utmpx != x; then
874 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)
875fi 882fi
876 883
877dnl# -------------------------------------------------------------------------- 884dnl# --------------------------------------------------------------------------
878 885
879dnl# find wtmp 886dnl# find wtmp
880AC_CACHE_CHECK(where wtmp is located, rxvt_cv_path_wtmp, 887AC_CACHE_CHECK(where wtmp is located, rxvt_cv_path_wtmp,
881[AC_TRY_RUN([#include <stdio.h> 888[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
882#include <sys/types.h> 889#include <sys/types.h>
883#ifdef HAVE_UTMP_H 890#ifdef HAVE_UTMP_H
884#include <utmp.h> 891#include <utmp.h>
885#endif 892#endif
886#include <errno.h> 893#include <errno.h>
… …
903 fprintf(f, "%s\n", *w); 910 fprintf(f, "%s\n", *w);
904 exit(0); 911 exit(0);
905 } 912 }
906 } 913 }
907 exit(0); 914 exit(0);
908}], rxvt_cv_path_wtmp=`cat conftestval`, rxvt_cv_path_wtmp=, dnl 915}]])],[rxvt_cv_path_wtmp=`cat conftestval`],[rxvt_cv_path_wtmp=],[dnl
909 AC_MSG_WARN([Define RXVT_WTMP_FILE in config.h manually]))]) 916 AC_MSG_WARN(Define RXVT_WTMP_FILE in config.h manually)])])
910if test x$rxvt_cv_path_wtmp != x; then 917if test x$rxvt_cv_path_wtmp != x; then
911 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)
912fi 919fi
913dnl# -------------------------------------------------------------------------- 920dnl# --------------------------------------------------------------------------
914 921
915dnl# find wtmpx 922dnl# find wtmpx
916AC_CACHE_CHECK(where wtmpx is located, rxvt_cv_path_wtmpx, 923AC_CACHE_CHECK(where wtmpx is located, rxvt_cv_path_wtmpx,
917[AC_TRY_RUN([#include <stdio.h> 924[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
918#ifdef HAVE_UTMPX_H 925#ifdef HAVE_UTMPX_H
919#include <utmpx.h> 926#include <utmpx.h>
920#endif 927#endif
921#include <errno.h> 928#include <errno.h>
922main() 929main()
… …
938 fprintf(f, "%s\n", *w); 945 fprintf(f, "%s\n", *w);
939 exit(0); 946 exit(0);
940 } 947 }
941 } 948 }
942 exit(0); 949 exit(0);
943}], rxvt_cv_path_wtmpx=`cat conftestval`, rxvt_cv_path_wtmpx=, dnl 950}]])],[rxvt_cv_path_wtmpx=`cat conftestval`],[rxvt_cv_path_wtmpx=],[dnl
944 AC_MSG_WARN([Define RXVT_WTMPX_FILE in config.h manually]))]) 951 AC_MSG_WARN(Define RXVT_WTMPX_FILE in config.h manually)])])
945if test x$rxvt_cv_path_wtmpx != x; then 952if test x$rxvt_cv_path_wtmpx != x; then
946 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)
947fi 954fi
948dnl# -------------------------------------------------------------------------- 955dnl# --------------------------------------------------------------------------
949 956
950dnl# find lastlog 957dnl# find lastlog
951AC_CACHE_CHECK(where lastlog is located, rxvt_cv_path_lastlog, 958AC_CACHE_CHECK(where lastlog is located, rxvt_cv_path_lastlog,
952[AC_TRY_RUN([#include <stdio.h> 959[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
953#include <sys/types.h> 960#include <sys/types.h>
954#ifdef HAVE_UTMPX_H 961#ifdef HAVE_UTMPX_H
955#include <utmpx.h> 962#include <utmpx.h>
956#elif defined(HAVE_UTMP_H) 963#elif defined(HAVE_UTMP_H)
957#include <utmp.h> 964#include <utmp.h>
… …
978 fprintf(f, "%s\n", *w); 985 fprintf(f, "%s\n", *w);
979 exit(0); 986 exit(0);
980 } 987 }
981 } 988 }
982 exit(0); 989 exit(0);
983}], rxvt_cv_path_lastlog=`cat conftestval`, rxvt_cv_path_lastlog=, dnl 990}]])],[rxvt_cv_path_lastlog=`cat conftestval`],[rxvt_cv_path_lastlog=],[dnl
984 AC_MSG_WARN([Define RXVT_LASTLOG_FILE in config.h manually]))]) 991 AC_MSG_WARN(Define RXVT_LASTLOG_FILE in config.h manually)])])
985if test x$rxvt_cv_path_lastlog != x; then 992if test x$rxvt_cv_path_lastlog != x; then
986 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)
987 if test -d "$rxvt_cv_path_lastlog"; then 994 if test -d "$rxvt_cv_path_lastlog"; then
988 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)
989 fi 996 fi
990fi 997fi
991dnl# -------------------------------------------------------------------------- 998dnl# --------------------------------------------------------------------------
992 999
993dnl# find lastlogx 1000dnl# find lastlogx
994AC_CACHE_CHECK(where lastlogx is located, rxvt_cv_path_lastlogx, 1001AC_CACHE_CHECK(where lastlogx is located, rxvt_cv_path_lastlogx,
995[AC_TRY_RUN([#include <stdio.h> 1002[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
996#ifdef HAVE_UTMPX_H 1003#ifdef HAVE_UTMPX_H
997#include <utmpx.h> 1004#include <utmpx.h>
998#endif 1005#endif
999#include <errno.h> 1006#include <errno.h>
1000main() 1007main()
… …
1015 fprintf(f, "%s\n", *w); 1022 fprintf(f, "%s\n", *w);
1016 exit(0); 1023 exit(0);
1017 } 1024 }
1018 } 1025 }
1019 exit(0); 1026 exit(0);
1020}], rxvt_cv_path_lastlogx=`cat conftestval`, rxvt_cv_path_lastlogx=, dnl 1027}]])],[rxvt_cv_path_lastlogx=`cat conftestval`],[rxvt_cv_path_lastlogx=],[dnl
1021 AC_MSG_WARN([Define RXVT_LASTLOGX_FILE in config.h manually]))]) 1028 AC_MSG_WARN(Define RXVT_LASTLOGX_FILE in config.h manually)])])
1022if test x$rxvt_cv_path_lastlogx != x; then 1029if test x$rxvt_cv_path_lastlogx != x; then
1023 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)
1024fi 1031fi
1025 1032
1026dnl# -------------------------------------------------------------------------- 1033dnl# --------------------------------------------------------------------------
… …
1050LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 1057LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
1051if 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
1052 LIBS=`echo $LIBS | sed "$R_TRANSLATE"` 1059 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
1053fi 1060fi
1054AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 1061AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
1055[AC_TRY_RUN([#include <X11/Xlib.h> 1062[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
1056main() { 1063main() {
1057char *p; 1064char *p;
1058if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 1065if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
1059exit (XSupportsLocale() ? 0 : 1); 1066exit (XSupportsLocale() ? 0 : 1);
1060else 1067else
1061exit (1);}], dnl 1068exit (1);}]])],[dnl
1062 rxvt_cv_func_xlocale=yes, rxvt_cv_func_xlocale=no, dnl 1069 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
1063 AC_MSG_WARN([Define NO_XLOCALE in config.h manually]))]) 1070 AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])])
1064if test x$rxvt_cv_func_xlocale = xyes; then 1071if test x$rxvt_cv_func_xlocale = xyes; then
1065 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works) 1072 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works)
1066fi 1073fi
1067 1074
1068AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, 1075AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
1069[AC_TRY_LINK([#define X_LOCALE 1 1076[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
1070#include <X11/Xlocale.h>], 1077#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
1071 [setlocale(LC_CTYPE, "");],
1072 rxvt_cv_func_xsetlocale=yes, rxvt_cv_func_xsetlocale=no)])
1073if test x$rxvt_cv_func_xsetlocale = xyes; then 1078if test x$rxvt_cv_func_xsetlocale = xyes; then
1074 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)
1075fi 1080fi
1076LIBS=$ac_save_LIBS 1081LIBS=$ac_save_LIBS
1077CFLAGS=$ac_save_CFLAGS 1082CFLAGS=$ac_save_CFLAGS
1078 1083
1079AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale, 1084AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
1080[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])])
1081 [setlocale(LC_CTYPE, "");],
1082 rxvt_cv_func_setlocale=yes, rxvt_cv_func_setlocale=no)])
1083if test x$rxvt_cv_func_setlocale = xyes; then 1086if test x$rxvt_cv_func_setlocale = xyes; then
1084 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works) 1087 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
1085fi 1088fi
1086 1089
1087AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo, 1090AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,
1088[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])])
1089 [nl_langinfo(CODESET);],
1090 rxvt_cv_func_nl_langinfo=yes, rxvt_cv_func_nl_langinfo=no)])
1091if test x$rxvt_cv_func_nl_langinfo = xyes; then 1092if test x$rxvt_cv_func_nl_langinfo = xyes; then
1092 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)
1093fi 1094fi
1094 1095
1095AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb, 1096AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
… …
1107if test x$rxvt_broken_ximcb = xyes; then 1108if test x$rxvt_broken_ximcb = xyes; then
1108 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.) 1109 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
1109fi 1110fi
1110 1111
1111AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt, 1112AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt,
1112[AC_TRY_LINK([#define _GNU_SOURCE 1113[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define _GNU_SOURCE
1113#ifdef HAVE_STDLIB_H 1114#ifdef HAVE_STDLIB_H
1114# include <cstdlib> 1115# include <cstdlib>
1115#endif], 1116#endif]], [[(void)getpt();]])],[rxvt_cv_func_getpt=yes],[rxvt_cv_func_getpt=no])])
1116 [(void)getpt();],
1117 rxvt_cv_func_getpt=yes, rxvt_cv_func_getpt=no)])
1118if test x$rxvt_cv_func_getpt = xyes; then 1117if test x$rxvt_cv_func_getpt = xyes; then
1119 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() )
1120fi 1119fi
1121 1120
1122dnl# 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
… …
1180if 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
1181 AC_DEFINE(PTYS_ARE_SEARCHED, 1, Define for this pty type) 1180 AC_DEFINE(PTYS_ARE_SEARCHED, 1, Define for this pty type)
1182fi 1181fi
1183 1182
1184 1183
1185AC_CHECKING(for pty ranges) 1184AS_MESSAGE(checking for pty ranges...)
1186ptys=`echo /dev/pty??` 1185ptys=`echo /dev/pty??`
1187pch1=`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'`
1188pch2=`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'`
1189if test x$pch1 != x; then 1188if test x$pch1 != x; then
1190 AC_DEFINE_UNQUOTED(PTYCHAR1, "$pch1", Define for first char in devptyXX) 1189 AC_DEFINE_UNQUOTED(PTYCHAR1, "$pch1", Define for first char in devptyXX)
… …
1194fi 1193fi
1195 1194
1196dnl# -------------------------------------------------------------------------- 1195dnl# --------------------------------------------------------------------------
1197dnl# now add and remove other stuff 1196dnl# now add and remove other stuff
1198dnl# -------------------------------------------------------------------------- 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
1199if test x$support_8bitctrls = xyes; then 1216if test x$support_8bitctrls = xyes; then
1200 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences) 1217 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
1201fi 1218fi
1202if test x$support_fading = xyes; then 1219if test x$support_fading = xyes; then
1203 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) 1220 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
… …
1215 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)
1216fi 1233fi
1217if test x$support_menubar = xyes; then 1234if test x$support_menubar = xyes; then
1218 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support) 1235 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support)
1219fi 1236fi
1220if test x$support_frills = xno; then 1237if test x$support_frills = xyes; then
1221 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)
1222fi
1223if test x$support_linespace = xno; then
1224 AC_DEFINE(NO_LINESPACE, 1, Define if you don't want support linespace)
1225fi 1239fi
1226if test x$support_24bit = xyes; then 1240if test x$support_24bit = xyes; then
1227 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)
1228fi 1242fi
1229if test x$support_mousewheel = xyes; then 1243if test x$support_mousewheel = xyes; then
… …
1279fi 1293fi
1280if test x$support_combining = xyes; then 1294if test x$support_combining = xyes; then
1281 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)
1282fi 1296fi
1283if test x$codesets = xall; then 1297if test x$codesets = xall; then
1284 codesets=jp,jp-ext,kr,cn,cn-ext 1298 codesets=jp,jp-ext,kr,zh,zh-ext
1285fi 1299fi
1300AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
1301AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
1286for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do 1302for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do
1287 AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
1288 AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
1289 case "$codeset" in 1303 case "$codeset" in
1290 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) ;;
1291 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) ;;
1292 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) ;;
1293 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) ;;
1294 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) ;;
1295 esac 1309 esac
1296done 1310done
1297 1311
1298dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket) 1312dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket)
1299 1313
… …
1354RXVT_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)
1355RXVT_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)
1356RXVT_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)
1357RXVT_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)
1358 1372
1359if test x$support_xft = xyes; then
1360 LIBS="$LIBS `pkg-config xft --libs`"
1361 CFLAGS="$CFLAGS `pkg-config xft --cflags`"
1362 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
1363
1364 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
1365 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
1366
1367 if test x$support_xft = xyes; then
1368 AC_DEFINE(XFT, 1, Define to enable xft support)
1369 fi
1370fi
1371
1372AC_OUTPUT(autoconf/Make.common \ 1373AC_CONFIG_FILES([autoconf/Make.common \
1373Makefile \ 1374Makefile \
1374doc/Makefile \ 1375doc/Makefile \
1375src/Makefile \ 1376src/Makefile \
1376src/test/Makefile \
1377src/rxvtlib.h \ 1377src/rxvtlib.h \
1378W11/Makefile \ 1378])
1379) 1379AC_OUTPUT
1380 1380
1381echo "Configuration: 1381echo "Configuration:
1382 1382
1383 Rxvt version: $VERSION : $DATE 1383 Rxvt version: $VERSION : $DATE
1384 Source code location: $srcdir 1384 Source code location: $srcdir
… …
1452 echo ". functions could not be found. ." 1452 echo ". functions could not be found. ."
1453 echo ". XIM is now being DISABLED! ." 1453 echo ". XIM is now being DISABLED! ."
1454 echo ".----------------------------------------------------------------." 1454 echo ".----------------------------------------------------------------."
1455fi 1455fi
1456 1456
1457echo " *** Please check src/feature.h for further options ***" 1457echo " *** Optionally check src/feature.h for further options ***"
1458echo 1458echo
1459 1459
1460echo ".----------------------------------------------------------------." 1460echo ".----------------------------------------------------------------."
1461echo ". NOTE: most features are disabled by default, try ." 1461echo ". NOTE: most features are disabled by default, try ."
1462echo ". 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. ."
1463echo ".----------------------------------------------------------------." 1468echo ".----------------------------------------------------------------."
1464echo 1469echo
1465 1470

Diff Legend

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