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

Diff Legend

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