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.53 by root, Sun Apr 17 22:36:13 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
… …
77support_mousewheel=no 99support_mousewheel=no
78support_mouseslipwheel=no 100support_mouseslipwheel=no
79support_utmp=no 101support_utmp=no
80support_wtmp=no 102support_wtmp=no
81support_lastlog=no 103support_lastlog=no
82support_cursor_blink=no
83support_text_blink=no 104support_text_blink=no
84support_pointer_blank=no 105support_pointer_blank=no
85support_scroll_rxvt=no 106support_scroll_rxvt=no
86support_scroll_next=no 107support_scroll_next=no
87support_scroll_xterm=no 108support_scroll_xterm=no
… …
90support_xpm=no 111support_xpm=no
91support_xft=no 112support_xft=no
92support_unicode3=no 113support_unicode3=no
93support_combining=no 114support_combining=no
94support_8bitctrls=no 115support_8bitctrls=no
116support_iso14755=no
117support_styles=no
95codesets= 118codesets=
96 119
97dnl# -------------------------------------------------------------------------- 120dnl# --------------------------------------------------------------------------
98dnl# CHECKING COMMAND LINE OPTIONS 121dnl# CHECKING COMMAND LINE OPTIONS
99dnl# -------------------------------------------------------------------------- 122dnl# --------------------------------------------------------------------------
… …
109 NOTE: this option is order dependent 132 NOTE: this option is order dependent
110 NOTE: automatically enabled with --enable-shared], 133 NOTE: automatically enabled with --enable-shared],
111 [if test x$enableval = xyes; then 134 [if test x$enableval = xyes; then
112 support_24bit=yes 135 support_24bit=yes
113 support_frills=yes 136 support_frills=yes
114 support_linespace=yes
115 support_inheritpixmap=yes 137 support_inheritpixmap=yes
116 support_tinting=yes 138 support_tinting=yes
117 support_fading=yes 139 support_fading=yes
118 support_keepscrolling=yes 140 support_keepscrolling=yes
119 support_selectionscrolling=yes 141 support_selectionscrolling=yes
120 support_lastlog=yes 142 support_lastlog=yes
121 support_menubar=yes 143 support_menubar=yes
122 support_mousewheel=yes 144 support_mousewheel=yes
123 support_mouseslipwheel=yes 145 support_mouseslipwheel=yes
124 support_cursor_blink=yes
125 support_text_blink=yes 146 support_text_blink=yes
126 support_pointer_blank=yes 147 support_pointer_blank=yes
127 support_scroll_rxvt=yes 148 support_scroll_rxvt=yes
128 support_scroll_next=yes 149 support_scroll_next=yes
129 support_scroll_xterm=yes 150 support_scroll_xterm=yes
… …
134 support_xpm=yes 155 support_xpm=yes
135 support_xft=yes 156 support_xft=yes
136 support_unicode3=yes 157 support_unicode3=yes
137 support_combining=yes 158 support_combining=yes
138 #support_8bitctrls=yes 159 #support_8bitctrls=yes
160 support_iso14755=yes
161 support_styles=yes
139 codesets=all 162 codesets=all
140 fi]) 163 fi])
141 164
142AC_ARG_ENABLE(unicode3, 165AC_ARG_ENABLE(unicode3,
143 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters], 166 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters],
144 [if test x$enableval = xyes -o x$enableval = xno; then 167 [if test x$enableval = xyes -o x$enableval = xno; then
145 support_unicode3=yes 168 support_unicode3=$enableval
146 fi]) 169 fi])
147 170
148AC_ARG_ENABLE(combining, 171AC_ARG_ENABLE(combining,
149 [ --enable-combining enable composition of base and combining characters], 172 [ --enable-combining enable composition of base and combining characters],
150 [if test x$enableval = xyes -o x$enableval = xno; then 173 [if test x$enableval = xyes -o x$enableval = xno; then
151 support_combining=yes 174 support_combining=$enableval
152 fi]) 175 fi])
153 176
154AC_ARG_ENABLE(xft, 177AC_ARG_ENABLE(xft,
155 [ --enable-xft enable xft support on systems that have it], 178 [ --enable-xft enable xft support on systems that have it],
156 [if test x$enableval = xyes -o x$enableval = xno; then 179 [if test x$enableval = xyes -o x$enableval = xno; then
157 support_xft=yes 180 support_xft=$enableval
181 fi])
182
183AC_ARG_ENABLE(font-styles,
184 [ --enable-font-styles enable bold and italic support],
185 [if test x$enableval = xyes -o x$enableval = xno; then
186 support_styles=$enableval
158 fi]) 187 fi])
159 188
160AC_ARG_ENABLE(utmp, 189AC_ARG_ENABLE(utmp,
161 [ --enable-utmp enable utmp (utmpx) support], 190 [ --enable-utmp enable utmp (utmpx) support],
162 [if test x$enableval = xyes -o x$enableval = xno; then 191 [if test x$enableval = xyes -o x$enableval = xno; then
… …
234 [if test x$enableval = xyes; then 263 [if test x$enableval = xyes; then
235 AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less) 264 AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less)
236 fi]) 265 fi])
237 266
238AC_ARG_WITH(codesets, 267AC_ARG_WITH(codesets,
239 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,cn,cn_ext,all)], 268 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
240 [codesets="$withval"]) 269 [codesets="$withval"])
241 270
242AC_ARG_ENABLE(xim, 271AC_ARG_ENABLE(xim,
243 [ --enable-xim XIM (X Input Method) protocol support], 272 [ --enable-xim XIM (X Input Method) protocol support],
244 [if test x$enableval = xyes -o x$enableval = xno; then 273 [if test x$enableval = xyes -o x$enableval = xno; then
… …
276 fi]) 305 fi])
277 306
278AC_ARG_ENABLE(8bitctrls, 307AC_ARG_ENABLE(8bitctrls,
279 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)], 308 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)],
280 [if test x$enableval = xyes -o x$enableval = xno; then 309 [if test x$enableval = xyes -o x$enableval = xno; then
281 support_8bitctrls=yes 310 support_8bitctrls=$enableval
282 fi]) 311 fi])
283 312
284RESFALLBACK=Rxvt 313RESFALLBACK=Rxvt
285AC_ARG_ENABLE(fallback, 314AC_ARG_ENABLE(fallback,
286 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)], 315 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)],
… …
308 337
309RXVTNAME=urxvt 338RXVTNAME=urxvt
310AC_ARG_WITH(name, 339AC_ARG_WITH(name,
311 [ --with-name=NAME set the basename for the installed binaries (default: urxvt)], 340 [ --with-name=NAME set the basename for the installed binaries (default: urxvt)],
312 [RXVTNAME="$withval"]) 341 [RXVTNAME="$withval"])
342AC_DEFINE_UNQUOTED(RXVTNAME,"$RXVTNAME", [Binary base name])
313 343
314RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"` 344RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"`
315AC_SUBST(RXVTNAME) 345AC_SUBST(RXVTNAME)
316 346
317AC_ARG_ENABLE(strings, 347AC_ARG_ENABLE(strings,
… …
324 [ --disable-swapscreen disable swap screen support], 354 [ --disable-swapscreen disable swap screen support],
325 [if test x$enableval = xno; then 355 [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) 356 AC_DEFINE(NO_SECONDARY_SCREEN, 1, Disable the secondary screen. Many programs use the secondary screen as their workplace)
327 fi]) 357 fi])
328 358
359AC_ARG_ENABLE(iso14755,
360 [ --enable-iso14755 enable support for extended ISO 14755 modes],
361 [if test x$enableval = xyes -o x$enableval = xno; then
362 support_iso14755=$enableval
363 fi])
364
329AC_ARG_ENABLE(frills, 365AC_ARG_ENABLE(frills,
330 [ --enable-frills enable support for rarely used features], 366 [ --enable-frills enable support for rarely used features],
331 [if test x$enableval = xyes -o x$enableval = xno; then 367 [if test x$enableval = xyes -o x$enableval = xno; then
332 support_frills=$enableval 368 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]) 369 fi])
340 370
341AC_ARG_ENABLE(24bit, 371AC_ARG_ENABLE(24bit,
342 [ --enable-24bit enable support for using 24bit visuals if available], 372 [ --enable-24bit enable support for using 24bit visuals if available],
343 [if test x$enableval = xyes -o x$enableval = xno; then 373 [if test x$enableval = xyes -o x$enableval = xno; then
… …
391 [ --enable-smart-resize enable smart growth/shrink behaviour], 421 [ --enable-smart-resize enable smart growth/shrink behaviour],
392 [if test x$enableval = xyes; then 422 [if test x$enableval = xyes; then
393 AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior) 423 AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior)
394 fi]) 424 fi])
395 425
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,
403 [ --enable-cursor-blink enable blinking cursor],
404 [if test x$enableval = xyes -o x$enableval = xno; then
405 support_cursor_blink=$enableval
406 fi])
407
408AC_ARG_ENABLE(text-blink, 426AC_ARG_ENABLE(text-blink,
409 [ --enable-text-blink enable blinking text], 427 [ --enable-text-blink enable blinking text],
410 [if test x$enableval = xyes -o x$enableval = xno; then 428 [if test x$enableval = xyes -o x$enableval = xno; then
411 support_text_blink=$enableval 429 support_text_blink=$enableval
412 fi]) 430 fi])
… …
430 fi]) 448 fi])
431 449
432dnl# -------------------------------------------------------------------------- 450dnl# --------------------------------------------------------------------------
433 451
434AC_DEFINE(PROTOTYPES, 1, Define if you need function prototypes) 452AC_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 453
451AC_PATH_PROG(MV, mv, mv) 454AC_PATH_PROG(MV, mv, mv)
452AC_PATH_PROG(RM, rm, rm) 455AC_PATH_PROG(RM, rm, rm)
453AC_PATH_PROG(CP, cp, cp) 456AC_PATH_PROG(CP, cp, cp)
454AC_PATH_PROG(LN, ln, ln) 457AC_PATH_PROG(LN, ln, ln)
455AC_PATH_PROG(SED, sed, sed) 458AC_PATH_PROG(SED, sed, sed)
456AC_PATH_PROG(ECHO, echo, echo) 459AC_PATH_PROG(ECHO, echo, echo)
457AC_PATH_PROG(CMP, cmp, cmp) 460AC_PATH_PROG(CMP, cmp, cmp)
458AC_PATH_PROG(TBL, tbl) 461AC_PATH_PROG(TBL, tbl)
462AC_PATH_PROG(TIC, tic)
459 463
460dnl# need a neat way to detect SVR4 or its features 464dnl# need a neat way to detect SVR4 or its features
461dnl# in src/command.c we use these functions: 465dnl# in src/command.c we use these functions:
462dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> 466dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
463dnl# - but are these also defined for other systems? 467dnl# - but are these also defined for other systems?
… …
500 sys/byteorder.h \ 504 sys/byteorder.h \
501 sys/ioctl.h \ 505 sys/ioctl.h \
502 sys/select.h \ 506 sys/select.h \
503 sys/sockio.h \ 507 sys/sockio.h \
504 sys/strredir.h \ 508 sys/strredir.h \
509 sys/stropts.h \
505 sys/time.h \ 510 sys/time.h \
506 utmp.h \ 511 utmp.h \
507 utmpx.h \ 512 utmpx.h \
508 stdint.h \ 513 stdint.h \
514 pty.h \
515 wchar.h \
516 cwchar \
517 clocale \
509) 518)
510 519
511AC_HEADER_TIME 520AC_HEADER_TIME
512 521
513dnl# check to allow both <termios.h> and <sys/ioctl.h> 522dnl# 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, 523AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
515[AC_TRY_COMPILE([#include <stdio.h> 524[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
516#include <sys/ioctl.h> 525#include <sys/ioctl.h>
517#ifdef HAVE_TERMIOS_H 526#ifdef HAVE_TERMIOS_H
518#include <termios.h> 527#include <termios.h>
519#endif], [int a = ECHO;], rxvt_cv_header_sysioctl=yes, rxvt_cv_header_sysioctl=no)]) 528#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
520 529
521dnl# ELF systems may want to store paths for dynamic libraries. 530dnl# ELF systems may want to store paths for dynamic libraries.
522dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath" 531dnl# 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. 532dnl# At least one version of SunOS wants "-R path" but it's not checked yet.
524if test -n "$GCC"; then 533if test -n "$GCC"; then
… …
533ac_save_CFLAGS=$CFLAGS 542ac_save_CFLAGS=$CFLAGS
534ac_save_LIBS=$LIBS 543ac_save_LIBS=$LIBS
535CFLAGS="$CFLAGS $X_CFLAGS" 544CFLAGS="$CFLAGS $X_CFLAGS"
536LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` 545LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
537AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath, 546AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath,
538[AC_TRY_RUN([ 547[AC_RUN_IFELSE([AC_LANG_SOURCE([[
539main() 548main()
540{ 549{
541 exit(0); 550 exit(0);
542 (void) XOpenDisplay("foobar"); 551 (void) XOpenDisplay("foobar");
543}], rxvt_cv_rpath=yes, rxvt_cv_rpath=no, dnl 552}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
544 AC_MSG_WARN([You may need to check the LIBS line]))]) 553 AC_MSG_WARN(You may need to check the LIBS line)])])
545if test x$rxvt_cv_rpath != xyes; then 554if test x$rxvt_cv_rpath != xyes; then
546 changequote(, )dnl 555 changequote(, )dnl
547 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g' 556 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
548 changequote([, ])dnl 557 changequote([, ])dnl
549 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` 558 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, 559 AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R,
551[AC_TRY_RUN([ 560[AC_RUN_IFELSE([AC_LANG_SOURCE([[
552main() 561main()
553{ 562{
554 exit(0); 563 exit(0);
555 (void) XOpenDisplay("foobar"); 564 (void) XOpenDisplay("foobar");
556}], rxvt_cv_R=yes, rxvt_cv_R=no, rxvt_cv_R=no)]) 565}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])
557 if test x$rxvt_cv_R != xyes; then 566 if test x$rxvt_cv_R != xyes; then
558 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 567 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
559 fi 568 fi
560fi 569fi
561 570
562AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 571AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
563[AC_TRY_COMPILE([#include <X11/Xlib.h>], [XPointer dummy;], 572[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 573if test x$rxvt_cv_xpointer = xyes; then
566 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 574 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
567fi 575fi
568LIBS=$ac_save_LIBS 576LIBS=$ac_save_LIBS
569CFLAGS=$ac_save_CFLAGS 577CFLAGS=$ac_save_CFLAGS
… …
582dnl> AC_CHECK_TYPE(umode_t, int) 590dnl> AC_CHECK_TYPE(umode_t, int)
583dnl> AC_CHECK_TYPE(off_t, long) 591dnl> AC_CHECK_TYPE(off_t, long)
584AC_TYPE_PID_T 592AC_TYPE_PID_T
585AC_TYPE_UID_T 593AC_TYPE_UID_T
586 594
587
588AC_CHECK_SIZEOF(char, 1)
589AC_CHECK_SIZEOF(short, 2) 595AC_CHECK_SIZEOF(short, 2)
590AC_CHECK_SIZEOF(int, 4) 596AC_CHECK_SIZEOF(int, 4)
591AC_CHECK_SIZEOF(long, 4) 597dnl AC_CHECK_SIZEOF(long, 4)
592AC_CHECK_SIZEOF(long long, 8) 598AC_CHECK_SIZEOF(long long, 8)
593AC_CHECK_SIZEOF(int *, 4) 599AC_CHECK_SIZEOF(int *, 4)
594 600
595dnl# see usage below 601dnl# see usage below
596AC_DEFUN(RXVT_CHECK_SIZE, 602AC_DEFUN(RXVT_CHECK_SIZE,
597 [AC_CACHE_CHECK([for $2], $1, 603 [AC_CACHE_CHECK([for $2], $1,
598 [AC_TRY_COMPILE([#include <stdint.h>], $2 dummy;, 604 [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 605if test "$ac_cv_sizeof_char" -ge $3; then
602 $1="$4 char" 606 $1="$4 char"
603else 607else
604 if test $ac_cv_sizeof_short -ge $3; then 608 if test "$ac_cv_sizeof_short" -ge $3; then
605 $1="$4 short" 609 $1="$4 short"
606 else 610 else
607 if test $ac_cv_sizeof_int -ge $3; then 611 if test "$ac_cv_sizeof_int" -ge $3; then
608 $1="$4 int" 612 $1="$4 int"
609 else 613 else
610 if test $ac_cv_sizeof_long -ge $3; then 614 if test "$ac_cv_sizeof_long" -ge $3; then
611 $1="$4 long" 615 $1="$4 long"
612 else 616 else
613 if test $ac_cv_sizeof_long_long -ge $3; then 617 if test "$ac_cv_sizeof_long_long" -ge $3; then
614 $1="$4 long long" 618 $1="$4 long long"
615 else 619 else
616 $1="$4 $5" # we _must_ have a (possibly wrong) default 620 $1="$4 $5" # we _must_ have a (possibly wrong) default
617 fi 621 fi
618 fi 622 fi
… …
645dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef) 649dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
646dnl AC_SUBST(rxvt_uint64_typedef) 650dnl AC_SUBST(rxvt_uint64_typedef)
647dnl# 651dnl#
648dnl# Now look for another we use 652dnl# Now look for another we use
649dnl# 653dnl#
650if test $ac_cv_sizeof_int_p -eq 8; then 654if test "$ac_cv_sizeof_int_p" -eq 8; then
651 rxvt_intp_define="#define intp_t int64_t" 655 rxvt_intp_define="#define intp_t int64_t"
652 rxvt_u_intp_define="#define u_intp_t u_int64_t" 656 rxvt_u_intp_define="#define u_intp_t u_int64_t"
653else 657else
654 if test $ac_cv_sizeof_int_p -eq 4; then 658 if test "$ac_cv_sizeof_int_p" -eq 4; then
655 rxvt_intp_define="#define intp_t int32_t" 659 rxvt_intp_define="#define intp_t int32_t"
656 rxvt_u_intp_define="#define u_intp_t u_int32_t" 660 rxvt_u_intp_define="#define u_intp_t u_int32_t"
657 else 661 else
658 if test $ac_cv_sizeof_int_p -eq 2; then 662 if test "$ac_cv_sizeof_int_p" -eq 2; then
659 rxvt_intp_define="#define intp_t int16_t" 663 rxvt_intp_define="#define intp_t int16_t"
660 rxvt_u_intp_define="#define u_intp_t u_int16_t" 664 rxvt_u_intp_define="#define u_intp_t u_int16_t"
661 else 665 else
662 rxvt_intp_define="#error set intp_t" 666 rxvt_intp_define="#error set intp_t"
663 rxvt_u_intp_define="#error set u_intp_t" 667 rxvt_u_intp_define="#error set u_intp_t"
… …
695 unlockpt \ 699 unlockpt \
696 isastream \ 700 isastream \
697 on_exit \ 701 on_exit \
698 nanosleep \ 702 nanosleep \
699 updwtmp \ 703 updwtmp \
704 updwtmpx \
700 ttyslot \ 705 ttyslot \
701) 706)
702dnl# Note: On NetBSD, openpty() exists in libutil. Don't pull it in 707dnl# Note: On NetBSD, openpty() exists in libutil. Don't pull it in
703 708
704dnl# -------------------------------------------------------------------------- 709dnl# --------------------------------------------------------------------------
… …
707dnl# check for host field in utmp structure 712dnl# check for host field in utmp structure
708 713
709dnl# -------------------------------------------- 714dnl# --------------------------------------------
710AC_CHECK_HEADER(utmp.h, 715AC_CHECK_HEADER(utmp.h,
711[AC_CACHE_CHECK([for struct utmp], rxvt_cv_struct_utmp, 716[AC_CACHE_CHECK([for struct utmp], rxvt_cv_struct_utmp,
712[AC_TRY_COMPILE([#include <sys/types.h> 717[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
713#include <stdint.h> 718#include <stdint.h>
714#include <utmp.h>], 719#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 720if test x$rxvt_cv_struct_utmp = xyes; then
718 AC_DEFINE(HAVE_STRUCT_UTMP, 1, Define if utmp.h has struct utmp) 721 AC_DEFINE(HAVE_STRUCT_UTMP, 1, Define if utmp.h has struct utmp)
719fi 722fi
720] 723]
721 724
722AC_CACHE_CHECK(for ut_host in utmp struct, rxvt_cv_struct_utmp_host, 725AC_CACHE_CHECK(for ut_host in utmp struct, rxvt_cv_struct_utmp_host,
723[AC_TRY_COMPILE([#include <sys/types.h> 726[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
724#include <utmp.h>], 727#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 728if test x$rxvt_cv_struct_utmp_host = xyes; then
728 AC_DEFINE(HAVE_UTMP_HOST, 1, Define if struct utmp contains ut_host) 729 AC_DEFINE(HAVE_UTMP_HOST, 1, Define if struct utmp contains ut_host)
729fi 730fi
730 731
731AC_CACHE_CHECK(for ut_pid in utmp struct, rxvt_cv_struct_utmp_pid, 732AC_CACHE_CHECK(for ut_pid in utmp struct, rxvt_cv_struct_utmp_pid,
732[AC_TRY_COMPILE([#include <sys/types.h> 733[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
733#include <utmp.h>], 734#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 735if test x$rxvt_cv_struct_utmp_pid = xyes; then
737 AC_DEFINE(HAVE_UTMP_PID, 1, Define if struct utmp contains ut_pid) 736 AC_DEFINE(HAVE_UTMP_PID, 1, Define if struct utmp contains ut_pid)
738fi 737fi
739) dnl# AC_CHECK_HEADER(utmp.h 738) dnl# AC_CHECK_HEADER(utmp.h
740 739
741dnl# -------------------------------------------- 740dnl# --------------------------------------------
742 741
743AC_CHECK_HEADER(utmpx.h, 742AC_CHECK_HEADER(utmpx.h,
744[AC_CACHE_CHECK([for struct utmpx], rxvt_cv_struct_utmpx, 743[AC_CACHE_CHECK([for struct utmpx], rxvt_cv_struct_utmpx,
744[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
745#include <utmpx.h>]], [[struct utmpx ut;]])],[rxvt_cv_struct_utmpx=yes],[rxvt_cv_struct_utmpx=no])])
746if test x$rxvt_cv_struct_utmpx = xyes; then
747 AC_DEFINE(HAVE_STRUCT_UTMPX, 1, Define if utmpx.h has struct utmpx)
748fi
749]
750
751AC_CACHE_CHECK(for host in utmpx struct, rxvt_cv_struct_utmpx_host,
752[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
753#include <utmpx.h>]], [[struct utmpx utx; utx.ut_host;]])],[rxvt_cv_struct_utmpx_host=yes],[rxvt_cv_struct_utmpx_host=no])])
754if test x$rxvt_cv_struct_utmpx_host = xyes; then
755 AC_DEFINE(HAVE_UTMPX_HOST, 1, Define if struct utmpx contains ut_host)
756fi
757
758AC_CACHE_CHECK(for session in utmpx struct, rxvt_cv_struct_utmpx_session,
745[AC_TRY_COMPILE([#include <sys/types.h> 759[AC_TRY_COMPILE([#include <sys/types.h>
746#include <utmpx.h>], 760#include <utmpx.h>],
747[struct utmpx ut;], 761[struct utmpx utx; utx.ut_session;],
748rxvt_cv_struct_utmpx=yes, rxvt_cv_struct_utmpx=no)]) 762rxvt_cv_struct_utmpx_session=yes, rxvt_cv_struct_utmpx_session=no)])
749if test x$rxvt_cv_struct_utmpx = xyes; then 763if 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) 764 AC_DEFINE(HAVE_UTMPX_SESSION, 1, Define if struct utmpx contains ut_session)
761fi 765fi
762) dnl# AC_CHECK_HEADER(utmpx.h 766) dnl# AC_CHECK_HEADER(utmpx.h
763
764 767
765dnl# -------------------------------------------------------------------------- 768dnl# --------------------------------------------------------------------------
766dnl# check for struct lastlog 769dnl# check for struct lastlog
767AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog, 770AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog,
768[AC_TRY_COMPILE([#include <sys/types.h> 771[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
769#include <utmp.h> 772#include <utmp.h>
770#ifdef HAVE_LASTLOG_H 773#ifdef HAVE_LASTLOG_H
771#include <lastlog.h> 774#include <lastlog.h>
772#endif 775#endif
773],
774[struct lastlog ll;],
775rxvt_cv_struct_lastlog=yes, rxvt_cv_struct_lastlog=no)]) 776]], [[struct lastlog ll;]])],[rxvt_cv_struct_lastlog=yes],[rxvt_cv_struct_lastlog=no])])
776if test x$rxvt_cv_struct_lastlog = xyes; then 777if 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) 778 AC_DEFINE(HAVE_STRUCT_LASTLOG, 1, Define if utmp.h or lastlog.h has struct lastlog)
778fi 779fi
779 780
780dnl# check for struct lastlogx 781dnl# check for struct lastlogx
781AC_CACHE_CHECK(for struct lastlogx, rxvt_cv_struct_lastlogx, 782AC_CACHE_CHECK(for struct lastlogx, rxvt_cv_struct_lastlogx,
782[AC_TRY_COMPILE([#include <sys/types.h> 783[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
783#include <utmpx.h> 784#include <utmpx.h>
784#ifdef HAVE_LASTLOG_H 785#ifdef HAVE_LASTLOG_H
785#include <lastlog.h> 786#include <lastlog.h>
786#endif 787#endif
787],
788[struct lastlogx ll;],
789rxvt_cv_struct_lastlogx=yes, rxvt_cv_struct_lastlogx=no)]) 788]], [[struct lastlogx ll;]])],[rxvt_cv_struct_lastlogx=yes],[rxvt_cv_struct_lastlogx=no])])
790if test x$rxvt_cv_struct_lastlogx = xyes; then 789if 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) 790 AC_DEFINE(HAVE_STRUCT_LASTLOGX, 1, Define if utmpx.h or lastlog.h has struct lastlogx)
792fi 791fi
793 792
794dnl# -------------------------------------------------------------------------- 793dnl# --------------------------------------------------------------------------
795dnl# FIND FILES 794dnl# FIND FILES
796dnl# -------------------------------------------------------------------------- 795dnl# --------------------------------------------------------------------------
797 796
798dnl# find utmp 797dnl# find utmp
799AC_CACHE_CHECK(where utmp is located, rxvt_cv_path_utmp, 798AC_CACHE_CHECK(where utmp is located, rxvt_cv_path_utmp,
800[AC_TRY_RUN([#include <stdio.h> 799[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
801#include <sys/types.h> 800#include <sys/types.h>
802#include <utmp.h> 801#include <utmp.h>
803#include <errno.h> 802#include <errno.h>
804main() 803main()
805{ 804{
… …
820 fprintf(f, "%s\n", *u); 819 fprintf(f, "%s\n", *u);
821 exit(0); 820 exit(0);
822 } 821 }
823 } 822 }
824 exit(0); 823 exit(0);
825}], rxvt_cv_path_utmp=`cat conftestval`, rxvt_cv_path_utmp=, dnl 824}]])],[rxvt_cv_path_utmp=`cat conftestval`],[rxvt_cv_path_utmp=],[dnl
826 AC_MSG_WARN([Define RXVT_UTMP_FILE in config.h manually]))]) 825 AC_MSG_WARN(Define RXVT_UTMP_FILE in config.h manually)])])
827if test x$rxvt_cv_path_utmp != x; then 826if test x$rxvt_cv_path_utmp != x; then
828 AC_DEFINE_UNQUOTED(RXVT_UTMP_FILE, "$rxvt_cv_path_utmp", Define location of utmp) 827 AC_DEFINE_UNQUOTED(RXVT_UTMP_FILE, "$rxvt_cv_path_utmp", Define location of utmp)
829fi 828fi
830 829
831dnl# -------------------------------------------------------------------------- 830dnl# --------------------------------------------------------------------------
832 831
833dnl# find utmpx - if a utmp file exists at the same location and is more than 832dnl# 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. 833dnl# a day newer, then dump the utmpx. People leave lots of junk around.
835AC_CACHE_CHECK(where utmpx is located, rxvt_cv_path_utmpx, 834AC_CACHE_CHECK(where utmpx is located, rxvt_cv_path_utmpx,
836[AC_TRY_RUN([#include <stdio.h> 835[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
837#include <sys/types.h> 836#include <sys/types.h>
838#include <utmpx.h> 837#include <utmpx.h>
839#include <errno.h> 838#include <errno.h>
840#include <sys/stat.h> 839#include <sys/stat.h>
841#ifdef HAVE_STRING_H 840#ifdef HAVE_STRING_H
… …
866 fprintf(f, "%s\n", *u); 865 fprintf(f, "%s\n", *u);
867 exit(0); 866 exit(0);
868 } 867 }
869 } 868 }
870 exit(0); 869 exit(0);
871}], rxvt_cv_path_utmpx=`cat conftestval`, rxvt_cv_path_utmpx=, dnl 870}]])],[rxvt_cv_path_utmpx=`cat conftestval`],[rxvt_cv_path_utmpx=],[dnl
872 AC_MSG_WARN([Define RXVT_UTMPX_FILE in config.h manually]))]) 871 AC_MSG_WARN(Define RXVT_UTMPX_FILE in config.h manually)])])
873if test x$rxvt_cv_path_utmpx != x; then 872if test x$rxvt_cv_path_utmpx != x; then
874 AC_DEFINE_UNQUOTED(RXVT_UTMPX_FILE, "$rxvt_cv_path_utmpx", Define location of utmpx) 873 AC_DEFINE_UNQUOTED(RXVT_UTMPX_FILE, "$rxvt_cv_path_utmpx", Define location of utmpx)
875fi 874fi
876 875
877dnl# -------------------------------------------------------------------------- 876dnl# --------------------------------------------------------------------------
878 877
879dnl# find wtmp 878dnl# find wtmp
880AC_CACHE_CHECK(where wtmp is located, rxvt_cv_path_wtmp, 879AC_CACHE_CHECK(where wtmp is located, rxvt_cv_path_wtmp,
881[AC_TRY_RUN([#include <stdio.h> 880[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
882#include <sys/types.h> 881#include <sys/types.h>
883#ifdef HAVE_UTMP_H 882#ifdef HAVE_UTMP_H
884#include <utmp.h> 883#include <utmp.h>
885#endif 884#endif
886#include <errno.h> 885#include <errno.h>
… …
903 fprintf(f, "%s\n", *w); 902 fprintf(f, "%s\n", *w);
904 exit(0); 903 exit(0);
905 } 904 }
906 } 905 }
907 exit(0); 906 exit(0);
908}], rxvt_cv_path_wtmp=`cat conftestval`, rxvt_cv_path_wtmp=, dnl 907}]])],[rxvt_cv_path_wtmp=`cat conftestval`],[rxvt_cv_path_wtmp=],[dnl
909 AC_MSG_WARN([Define RXVT_WTMP_FILE in config.h manually]))]) 908 AC_MSG_WARN(Define RXVT_WTMP_FILE in config.h manually)])])
910if test x$rxvt_cv_path_wtmp != x; then 909if test x$rxvt_cv_path_wtmp != x; then
911 AC_DEFINE_UNQUOTED(RXVT_WTMP_FILE, "$rxvt_cv_path_wtmp", Define location of wtmp) 910 AC_DEFINE_UNQUOTED(RXVT_WTMP_FILE, "$rxvt_cv_path_wtmp", Define location of wtmp)
912fi 911fi
913dnl# -------------------------------------------------------------------------- 912dnl# --------------------------------------------------------------------------
914 913
915dnl# find wtmpx 914dnl# find wtmpx
916AC_CACHE_CHECK(where wtmpx is located, rxvt_cv_path_wtmpx, 915AC_CACHE_CHECK(where wtmpx is located, rxvt_cv_path_wtmpx,
917[AC_TRY_RUN([#include <stdio.h> 916[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
918#ifdef HAVE_UTMPX_H 917#ifdef HAVE_UTMPX_H
919#include <utmpx.h> 918#include <utmpx.h>
920#endif 919#endif
921#include <errno.h> 920#include <errno.h>
922main() 921main()
… …
938 fprintf(f, "%s\n", *w); 937 fprintf(f, "%s\n", *w);
939 exit(0); 938 exit(0);
940 } 939 }
941 } 940 }
942 exit(0); 941 exit(0);
943}], rxvt_cv_path_wtmpx=`cat conftestval`, rxvt_cv_path_wtmpx=, dnl 942}]])],[rxvt_cv_path_wtmpx=`cat conftestval`],[rxvt_cv_path_wtmpx=],[dnl
944 AC_MSG_WARN([Define RXVT_WTMPX_FILE in config.h manually]))]) 943 AC_MSG_WARN(Define RXVT_WTMPX_FILE in config.h manually)])])
945if test x$rxvt_cv_path_wtmpx != x; then 944if test x$rxvt_cv_path_wtmpx != x; then
946 AC_DEFINE_UNQUOTED(RXVT_WTMPX_FILE, "$rxvt_cv_path_wtmpx", Define location of wtmpx) 945 AC_DEFINE_UNQUOTED(RXVT_WTMPX_FILE, "$rxvt_cv_path_wtmpx", Define location of wtmpx)
947fi 946fi
948dnl# -------------------------------------------------------------------------- 947dnl# --------------------------------------------------------------------------
949 948
950dnl# find lastlog 949dnl# find lastlog
951AC_CACHE_CHECK(where lastlog is located, rxvt_cv_path_lastlog, 950AC_CACHE_CHECK(where lastlog is located, rxvt_cv_path_lastlog,
952[AC_TRY_RUN([#include <stdio.h> 951[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
953#include <sys/types.h> 952#include <sys/types.h>
954#ifdef HAVE_UTMPX_H 953#ifdef HAVE_UTMPX_H
955#include <utmpx.h> 954#include <utmpx.h>
956#elif defined(HAVE_UTMP_H) 955#elif defined(HAVE_UTMP_H)
957#include <utmp.h> 956#include <utmp.h>
… …
978 fprintf(f, "%s\n", *w); 977 fprintf(f, "%s\n", *w);
979 exit(0); 978 exit(0);
980 } 979 }
981 } 980 }
982 exit(0); 981 exit(0);
983}], rxvt_cv_path_lastlog=`cat conftestval`, rxvt_cv_path_lastlog=, dnl 982}]])],[rxvt_cv_path_lastlog=`cat conftestval`],[rxvt_cv_path_lastlog=],[dnl
984 AC_MSG_WARN([Define RXVT_LASTLOG_FILE in config.h manually]))]) 983 AC_MSG_WARN(Define RXVT_LASTLOG_FILE in config.h manually)])])
985if test x$rxvt_cv_path_lastlog != x; then 984if test x$rxvt_cv_path_lastlog != x; then
986 AC_DEFINE_UNQUOTED(RXVT_LASTLOG_FILE, "$rxvt_cv_path_lastlog", Define location of lastlog) 985 AC_DEFINE_UNQUOTED(RXVT_LASTLOG_FILE, "$rxvt_cv_path_lastlog", Define location of lastlog)
987 if test -d "$rxvt_cv_path_lastlog"; then 986 if test -d "$rxvt_cv_path_lastlog"; then
988 AC_DEFINE(LASTLOG_IS_DIR, 1, Define if lastlog is provided via a directory) 987 AC_DEFINE(LASTLOG_IS_DIR, 1, Define if lastlog is provided via a directory)
989 fi 988 fi
990fi 989fi
991dnl# -------------------------------------------------------------------------- 990dnl# --------------------------------------------------------------------------
992 991
993dnl# find lastlogx 992dnl# find lastlogx
994AC_CACHE_CHECK(where lastlogx is located, rxvt_cv_path_lastlogx, 993AC_CACHE_CHECK(where lastlogx is located, rxvt_cv_path_lastlogx,
995[AC_TRY_RUN([#include <stdio.h> 994[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
996#ifdef HAVE_UTMPX_H 995#ifdef HAVE_UTMPX_H
997#include <utmpx.h> 996#include <utmpx.h>
998#endif 997#endif
999#include <errno.h> 998#include <errno.h>
1000main() 999main()
… …
1015 fprintf(f, "%s\n", *w); 1014 fprintf(f, "%s\n", *w);
1016 exit(0); 1015 exit(0);
1017 } 1016 }
1018 } 1017 }
1019 exit(0); 1018 exit(0);
1020}], rxvt_cv_path_lastlogx=`cat conftestval`, rxvt_cv_path_lastlogx=, dnl 1019}]])],[rxvt_cv_path_lastlogx=`cat conftestval`],[rxvt_cv_path_lastlogx=],[dnl
1021 AC_MSG_WARN([Define RXVT_LASTLOGX_FILE in config.h manually]))]) 1020 AC_MSG_WARN(Define RXVT_LASTLOGX_FILE in config.h manually)])])
1022if test x$rxvt_cv_path_lastlogx != x; then 1021if test x$rxvt_cv_path_lastlogx != x; then
1023 AC_DEFINE_UNQUOTED(RXVT_LASTLOGX_FILE, "$rxvt_cv_path_lastlogx", Define location of lastlogx) 1022 AC_DEFINE_UNQUOTED(RXVT_LASTLOGX_FILE, "$rxvt_cv_path_lastlogx", Define location of lastlogx)
1024fi 1023fi
1025 1024
1026dnl# -------------------------------------------------------------------------- 1025dnl# --------------------------------------------------------------------------
… …
1050LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 1049LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
1051if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then 1050if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
1052 LIBS=`echo $LIBS | sed "$R_TRANSLATE"` 1051 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
1053fi 1052fi
1054AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 1053AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
1055[AC_TRY_RUN([#include <X11/Xlib.h> 1054[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
1056main() { 1055main() {
1057char *p; 1056char *p;
1058if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 1057if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
1059exit (XSupportsLocale() ? 0 : 1); 1058exit (XSupportsLocale() ? 0 : 1);
1060else 1059else
1061exit (1);}], dnl 1060exit (1);}]])],[dnl
1062 rxvt_cv_func_xlocale=yes, rxvt_cv_func_xlocale=no, dnl 1061 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
1063 AC_MSG_WARN([Define NO_XLOCALE in config.h manually]))]) 1062 AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])])
1064if test x$rxvt_cv_func_xlocale = xyes; then 1063if test x$rxvt_cv_func_xlocale = xyes; then
1065 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works) 1064 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works)
1066fi 1065fi
1067 1066
1068AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, 1067AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
1069[AC_TRY_LINK([#define X_LOCALE 1 1068[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
1070#include <X11/Xlocale.h>], 1069#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 1070if test x$rxvt_cv_func_xsetlocale = xyes; then
1074 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 1071 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
1075fi 1072fi
1076LIBS=$ac_save_LIBS 1073LIBS=$ac_save_LIBS
1077CFLAGS=$ac_save_CFLAGS 1074CFLAGS=$ac_save_CFLAGS
1078 1075
1079AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale, 1076AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
1080[AC_TRY_LINK([#include <clocale>], 1077[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 1078if test x$rxvt_cv_func_setlocale = xyes; then
1084 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works) 1079 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
1085fi 1080fi
1086 1081
1087AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo, 1082AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,
1088[AC_TRY_LINK([#include <langinfo.h>], 1083[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 1084if test x$rxvt_cv_func_nl_langinfo = xyes; then
1092 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) 1085 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
1093fi 1086fi
1094 1087
1095AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb, 1088AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
… …
1107if test x$rxvt_broken_ximcb = xyes; then 1100if test x$rxvt_broken_ximcb = xyes; then
1108 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.) 1101 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
1109fi 1102fi
1110 1103
1111AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt, 1104AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt,
1112[AC_TRY_LINK([#define _GNU_SOURCE 1105[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define _GNU_SOURCE
1113#ifdef HAVE_STDLIB_H 1106#ifdef HAVE_STDLIB_H
1114# include <cstdlib> 1107# include <cstdlib>
1115#endif], 1108#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 1109if test x$rxvt_cv_func_getpt = xyes; then
1119 AC_DEFINE(HAVE_GETPT, 1, Define if you have _GNU_SOURCE getpt() ) 1110 AC_DEFINE(HAVE_GETPT, 1, Define if you have _GNU_SOURCE getpt() )
1120fi 1111fi
1121 1112
1122dnl# if we don't guess right then it's up to the user 1113dnl# 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 1171if 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) 1172 AC_DEFINE(PTYS_ARE_SEARCHED, 1, Define for this pty type)
1182fi 1173fi
1183 1174
1184 1175
1185AC_CHECKING(for pty ranges) 1176AS_MESSAGE(checking for pty ranges...)
1186ptys=`echo /dev/pty??` 1177ptys=`echo /dev/pty??`
1187pch1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'` 1178pch1=`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'` 1179pch2=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'`
1189if test x$pch1 != x; then 1180if test x$pch1 != x; then
1190 AC_DEFINE_UNQUOTED(PTYCHAR1, "$pch1", Define for first char in devptyXX) 1181 AC_DEFINE_UNQUOTED(PTYCHAR1, "$pch1", Define for first char in devptyXX)
… …
1194fi 1185fi
1195 1186
1196dnl# -------------------------------------------------------------------------- 1187dnl# --------------------------------------------------------------------------
1197dnl# now add and remove other stuff 1188dnl# now add and remove other stuff
1198dnl# -------------------------------------------------------------------------- 1189dnl# --------------------------------------------------------------------------
1190if test x$support_xft = xyes; then
1191 LIBS="$LIBS `pkg-config xft --libs`"
1192 CFLAGS="$CFLAGS `pkg-config xft --cflags`"
1193 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
1194
1195 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
1196 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
1197
1198 if test x$support_xft = xyes; then
1199 AC_DEFINE(XFT, 1, Define to enable xft support)
1200 fi
1201fi
1202if test x$support_styles = xyes; then
1203 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
1204fi
1205if test x$support_iso14755 = xyes; then
1206 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
1207fi
1199if test x$support_8bitctrls = xyes; then 1208if test x$support_8bitctrls = xyes; then
1200 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences) 1209 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
1201fi 1210fi
1202if test x$support_fading = xyes; then 1211if test x$support_fading = xyes; then
1203 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) 1212 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) 1224 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)
1216fi 1225fi
1217if test x$support_menubar = xyes; then 1226if test x$support_menubar = xyes; then
1218 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support) 1227 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support)
1219fi 1228fi
1220if test x$support_frills = xno; then 1229if test x$support_frills = xyes; then
1221 AC_DEFINE(NO_FRILLS, 1, Define if you don't want handling for rarely used features) 1230 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 1231fi
1226if test x$support_24bit = xyes; then 1232if 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) 1233 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 1234fi
1229if test x$support_mousewheel = xyes; then 1235if test x$support_mousewheel = xyes; then
… …
1266 scrolltypes="$scrolltypes plain" 1272 scrolltypes="$scrolltypes plain"
1267fi 1273fi
1268if test x$support_pointer_blank = xyes; then 1274if test x$support_pointer_blank = xyes; then
1269 AC_DEFINE(POINTER_BLANK, 1, Define if you want hide the pointer while typing) 1275 AC_DEFINE(POINTER_BLANK, 1, Define if you want hide the pointer while typing)
1270fi 1276fi
1271if test x$support_cursor_blink = xyes; then
1272 AC_DEFINE(CURSOR_BLINK, 1, Define if you want blinking cursor support)
1273fi
1274if test x$support_text_blink = xyes; then 1277if test x$support_text_blink = xyes; then
1275 AC_DEFINE(TEXT_BLINK, 1, Define if you want blinking text support) 1278 AC_DEFINE(TEXT_BLINK, 1, Define if you want blinking text support)
1276fi 1279fi
1277if test x$support_unicode3 = xyes; then 1280if test x$support_unicode3 = xyes; then
1278 AC_DEFINE(UNICODE_3, 1, Define if you want to represent unicode characters outside plane 0) 1281 AC_DEFINE(UNICODE_3, 1, Define if you want to represent unicode characters outside plane 0)
1279fi 1282fi
1280if test x$support_combining = xyes; then 1283if test x$support_combining = xyes; then
1281 AC_DEFINE(ENABLE_COMBINING, 1, Define if you want to automatically compose combining characters) 1284 AC_DEFINE(ENABLE_COMBINING, 1, Define if you want to automatically compose combining characters)
1282fi 1285fi
1283if test x$codesets = xall; then 1286if test x$codesets = xall; then
1284 codesets=jp,jp-ext,kr,cn,cn-ext 1287 codesets=jp,jp-ext,kr,zh,zh-ext
1285fi 1288fi
1289AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
1290AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
1286for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do 1291for 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 1292 case "$codeset" in
1290 JP ) AC_DEFINE(ENCODING_JP, 1, Define if you want japanese codesets) ;; 1293 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) ;; 1294 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) ;; 1295 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) ;; 1296 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) ;; 1297 ZH_EXT ) AC_DEFINE(ENCODING_ZH_EXT, 1, Define if you want extended chinese codesets) ;;
1295 esac 1298 esac
1296done 1299done
1297 1300
1298dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket) 1301dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket)
1299 1302
… …
1354RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch) 1357RXVT_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) 1358RXVT_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) 1359RXVT_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) 1360RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
1358 1361
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 \ 1362AC_CONFIG_FILES([autoconf/Make.common \
1373Makefile \ 1363Makefile \
1374doc/Makefile \ 1364doc/Makefile \
1375src/Makefile \ 1365src/Makefile \
1376src/test/Makefile \
1377src/rxvtlib.h \ 1366src/rxvtlib.h \
1378W11/Makefile \ 1367])
1379) 1368AC_OUTPUT
1380 1369
1381echo "Configuration: 1370echo "Configuration:
1382 1371
1383 Rxvt version: $VERSION : $DATE 1372 Rxvt version: $VERSION : $DATE
1384 Source code location: $srcdir 1373 Source code location: $srcdir
… …
1452 echo ". functions could not be found. ." 1441 echo ". functions could not be found. ."
1453 echo ". XIM is now being DISABLED! ." 1442 echo ". XIM is now being DISABLED! ."
1454 echo ".----------------------------------------------------------------." 1443 echo ".----------------------------------------------------------------."
1455fi 1444fi
1456 1445
1457echo " *** Please check src/feature.h for further options ***" 1446echo " *** Optionally check src/feature.h for further options ***"
1458echo 1447echo
1459 1448
1460echo ".----------------------------------------------------------------." 1449echo ".----------------------------------------------------------------."
1461echo ". NOTE: most features are disabled by default, try ." 1450echo ". NOTE: most features are disabled by default, try ."
1462echo ". configure --help to get an idea of the optional features ." 1451echo ". configure --help to get an idea of the optional features, ."
1452echo ". or read ./README.configure ."
1453echo ". ."
1454echo ". The script ./reconf gives a reasonable baseline, try it if ."
1455echo ". you do not want to read documentation and still want some ."
1456echo ". useful features. ."
1463echo ".----------------------------------------------------------------." 1457echo ".----------------------------------------------------------------."
1464echo 1458echo
1465 1459

Diff Legend

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