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.31 by root, Tue Aug 10 22:36:30 2004 UTC vs.
Revision 1.58 by root, Sun Jan 1 06:18:20 2006 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#
5orig_CXXFLAGS="$CXXFLAGS"
6
5AC_INIT 7AC_INIT
6AC_CONFIG_SRCDIR([src/feature.h]) 8AC_CONFIG_SRCDIR([src/feature.h])
7AC_CONFIG_AUX_DIR(autoconf) 9AC_CONFIG_AUX_DIR(autoconf)
8AC_CONFIG_HEADER(config.h:autoconf/config.h.in) 10AC_CONFIG_HEADER(config.h:autoconf/config.h.in)
9 11
12AC_CANONICAL_HOST
13
10dnl RXVT version 14dnl RXVT version
11changequote(, )dnl 15changequote(, )dnl
12VERSION=`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`
13DATE=`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`
14LSMDATE=`sed -n -e 's/^.*[ \t]LSMDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
15LIBVERSION=`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`
16changequote([, ])dnl 19changequote([, ])dnl
17AC_SUBST(VERSION)dnl 20AC_SUBST(VERSION)dnl
18AC_SUBST(DATE)dnl 21AC_SUBST(DATE)dnl
19AC_SUBST(LSMDATE)dnl 22AC_SUBST(LSMDATE)dnl
20AC_SUBST(LIBVERSION)dnl 23AC_SUBST(LIBVERSION)dnl
… …
31AC_PROG_INSTALL 34AC_PROG_INSTALL
32AC_PROG_AWK 35AC_PROG_AWK
33 36
34AC_LANG(C) 37AC_LANG(C)
35 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
36LINKER="$CXX" 50LINKER="$CXX"
37if test x$GCC = xyes && test x$GXX = xyes; then 51if test x$GCC = xyes && test x$GXX = xyes; then
38 AC_CHECK_LIB(supc++, main, [ 52 AC_CHECK_LIB(supc++, main, [
39 LINKER="$CC" 53 LINKER="$CC"
40 LIBS="$LIBS -lsupc++" 54 LIBS="$LIBS -lsupc++"
41 ]) 55 ])
42fi 56fi
43AC_SUBST(LINKER,[$LINKER]) 57AC_SUBST(LINKER,[$LINKER])
44 58
45CPPFLAGS="-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
46 68
47dnl if test x$GXX = xyes; then 69dnl if test x$GXX = xyes; then
48dnl 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...
49dnl fi 71dnl fi
50 72
… …
53dnl# system hacks 75dnl# system hacks
54AC_AIX 76AC_AIX
55AC_ISC_POSIX 77AC_ISC_POSIX
56 78
57dnl# FreeBSD needs to link libxpg4 79dnl# FreeBSD needs to link libxpg4
58AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"]) 80AC_CHECK_FUNC(setlocale, [], [AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])])
59 81
60dnl solaris needs to link libnsl and socket 82dnl solaris needs to link libnsl and socket
61AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"]) 83AC_CHECK_FUNC(gethostbyname, [], [AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])])
62AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"]) 84AC_CHECK_FUNC(socket, [], [AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])])
63 85
86dnl sched_yield to improve terminal efficiency
87AC_MSG_CHECKING(for sched_yield support)
88AC_TRY_LINK([#include <sched.h>],[sched_yield ()],
89 [AC_MSG_RESULT(yes)
90 AC_DEFINE(HAVE_SCHED_YIELD, 1, Define if you have sched-h and sched_yield)],
91 [AC_MSG_RESULT(no)])
92
64AC_ENABLE_SHARED(no)dnl# libtool 93dnl AC_ENABLE_SHARED(no)dnl# libtool
65AC_ENABLE_STATIC(yes)dnl# libtool 94dnl AC_ENABLE_STATIC(yes)dnl# libtool
66AC_PROG_LIBTOOL()dnl# libtool 95dnl AC_PROG_LIBTOOL()dnl# libtool
67 96
68MALLOC_TYPE=S 97MALLOC_TYPE=S
98
69support_addstrings=no 99support_addstrings=no
70support_frills=no 100support_frills=yes
71support_linespace=no
72support_inheritpixmap=no 101support_inheritpixmap=no
73support_tinting=no 102support_tinting=yes
74support_fading=no 103support_fading=yes
75support_keepscrolling=no 104support_keepscrolling=yes
76support_selectionscrolling=no 105support_selectionscrolling=yes
77support_menubar=no 106support_menubar=no
78support_mousewheel=no 107support_mousewheel=yes
79support_mouseslipwheel=no 108support_mouseslipwheel=yes
80support_utmp=no 109support_utmp=yes
81support_wtmp=no 110support_wtmp=yes
82support_lastlog=no 111support_lastlog=yes
83support_cursor_blink=no
84support_text_blink=no 112support_text_blink=yes
85support_pointer_blank=no 113support_pointer_blank=yes
86support_scroll_rxvt=no 114support_scroll_rxvt=yes
87support_scroll_next=no 115support_scroll_next=yes
88support_scroll_xterm=no 116support_scroll_xterm=yes
89support_scroll_plain=no 117support_scroll_plain=yes
90support_xim=no 118support_xim=yes
91support_xpm=no 119support_xpm=no
92support_xft=no 120support_xft=yes
93support_unicode3=no 121support_unicode3=no
94support_combining=no 122support_combining=yes
95support_8bitctrls=no 123support_8bitctrls=no
124support_iso14755=yes
125support_styles=yes
96codesets= 126codesets=all
97 127
98dnl# -------------------------------------------------------------------------- 128dnl# --------------------------------------------------------------------------
99dnl# CHECKING COMMAND LINE OPTIONS 129dnl# CHECKING COMMAND LINE OPTIONS
100dnl# -------------------------------------------------------------------------- 130dnl# --------------------------------------------------------------------------
101 131
… …
107 137
108AC_ARG_ENABLE(everything, 138AC_ARG_ENABLE(everything,
109 [ --enable-everything enable standard non-multichoice features 139 [ --enable-everything enable standard non-multichoice features
110 NOTE: this option is order dependent 140 NOTE: this option is order dependent
111 NOTE: automatically enabled with --enable-shared], 141 NOTE: automatically enabled with --enable-shared],
142 [
143 if test x$enableval = xno; then
144 support_24bit=no
145 support_frills=no
146 support_inheritpixmap=no
147 support_tinting=no
148 support_fading=no
149 support_keepscrolling=no
150 support_selectionscrolling=no
151 support_lastlog=no
152 support_menubar=no
153 support_mousewheel=no
154 support_mouseslipwheel=no
155 support_text_blink=no
156 support_pointer_blank=no
157 support_scroll_rxvt=no
158 support_scroll_next=no
159 support_scroll_xterm=no
160 support_scroll_plain=no
161 support_utmp=no
162 support_wtmp=no
163 support_xim=no
164 support_xpm=no
165 support_xft=no
166 support_unicode3=no
167 support_combining=no
168 support_8bitctrls=no
169 support_iso14755=no
170 support_styles=no
171 codesets=
172 fi
112 [if test x$enableval = xyes; then 173 if test x$enableval = xyes; then
113 support_24bit=yes 174 support_24bit=yes
114 support_frills=yes 175 support_frills=yes
115 support_linespace=yes
116 support_inheritpixmap=yes 176 support_inheritpixmap=yes
117 support_tinting=yes 177 support_tinting=yes
118 support_fading=yes 178 support_fading=yes
119 support_keepscrolling=yes 179 support_keepscrolling=yes
120 support_selectionscrolling=yes 180 support_selectionscrolling=yes
121 support_lastlog=yes 181 support_lastlog=yes
122 support_menubar=yes 182 support_menubar=yes
123 support_mousewheel=yes 183 support_mousewheel=yes
124 support_mouseslipwheel=yes 184 support_mouseslipwheel=yes
125 support_cursor_blink=yes
126 support_text_blink=yes 185 support_text_blink=yes
127 support_pointer_blank=yes 186 support_pointer_blank=yes
128 support_scroll_rxvt=yes 187 support_scroll_rxvt=yes
129 support_scroll_next=yes 188 support_scroll_next=yes
130 support_scroll_xterm=yes 189 support_scroll_xterm=yes
131 support_scroll_plain=yes 190 support_scroll_plain=yes
132 support_utmp=yes 191 support_utmp=yes
133 support_wtmp=yes 192 support_wtmp=yes
134 support_xim=yes 193 support_xim=yes
135 support_xpm=yes 194 support_xpm=yes
136 support_xft=yes 195 support_xft=yes
137 support_unicode3=yes 196 support_unicode3=yes
138 support_combining=yes 197 support_combining=yes
139 #support_8bitctrls=yes 198 #support_8bitctrls=yes
199 support_iso14755=yes
200 support_styles=yes
140 codesets=all 201 codesets=all
202 fi
141 fi]) 203 ])
142 204
143AC_ARG_ENABLE(unicode3, 205AC_ARG_ENABLE(unicode3,
144 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters], 206 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters],
145 [if test x$enableval = xyes -o x$enableval = xno; then 207 [if test x$enableval = xyes -o x$enableval = xno; then
146 support_unicode3=yes 208 support_unicode3=$enableval
147 fi]) 209 fi])
148 210
149AC_ARG_ENABLE(combining, 211AC_ARG_ENABLE(combining,
150 [ --enable-combining enable composition of base and combining characters], 212 [ --enable-combining enable composition of base and combining characters],
151 [if test x$enableval = xyes -o x$enableval = xno; then 213 [if test x$enableval = xyes -o x$enableval = xno; then
152 support_combining=yes 214 support_combining=$enableval
153 fi]) 215 fi])
154 216
155AC_ARG_ENABLE(xft, 217AC_ARG_ENABLE(xft,
156 [ --enable-xft enable xft support on systems that have it], 218 [ --enable-xft enable xft support on systems that have it],
157 [if test x$enableval = xyes -o x$enableval = xno; then 219 [if test x$enableval = xyes -o x$enableval = xno; then
158 support_xft=yes 220 support_xft=$enableval
221 fi])
222
223AC_ARG_ENABLE(font-styles,
224 [ --enable-font-styles enable bold and italic support],
225 [if test x$enableval = xyes -o x$enableval = xno; then
226 support_styles=$enableval
159 fi]) 227 fi])
160 228
161AC_ARG_ENABLE(utmp, 229AC_ARG_ENABLE(utmp,
162 [ --enable-utmp enable utmp (utmpx) support], 230 [ --enable-utmp enable utmp (utmpx) support],
163 [if test x$enableval = xyes -o x$enableval = xno; then 231 [if test x$enableval = xyes -o x$enableval = xno; then
… …
235 [if test x$enableval = xyes; then 303 [if test x$enableval = xyes; then
236 AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less) 304 AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less)
237 fi]) 305 fi])
238 306
239AC_ARG_WITH(codesets, 307AC_ARG_WITH(codesets,
240 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,cn,cn_ext,all)], 308 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
241 [codesets="$withval"]) 309 [codesets="$withval"])
242 310
243AC_ARG_ENABLE(xim, 311AC_ARG_ENABLE(xim,
244 [ --enable-xim XIM (X Input Method) protocol support], 312 [ --enable-xim XIM (X Input Method) protocol support],
245 [if test x$enableval = xyes -o x$enableval = xno; then 313 [if test x$enableval = xyes -o x$enableval = xno; then
… …
277 fi]) 345 fi])
278 346
279AC_ARG_ENABLE(8bitctrls, 347AC_ARG_ENABLE(8bitctrls,
280 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)], 348 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)],
281 [if test x$enableval = xyes -o x$enableval = xno; then 349 [if test x$enableval = xyes -o x$enableval = xno; then
282 support_8bitctrls=yes 350 support_8bitctrls=$enableval
283 fi]) 351 fi])
284 352
285RESFALLBACK=Rxvt 353RESFALLBACK=Rxvt
286AC_ARG_ENABLE(fallback, 354AC_ARG_ENABLE(fallback,
287 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)], 355 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)],
… …
309 377
310RXVTNAME=urxvt 378RXVTNAME=urxvt
311AC_ARG_WITH(name, 379AC_ARG_WITH(name,
312 [ --with-name=NAME set the basename for the installed binaries (default: urxvt)], 380 [ --with-name=NAME set the basename for the installed binaries (default: urxvt)],
313 [RXVTNAME="$withval"]) 381 [RXVTNAME="$withval"])
382AC_DEFINE_UNQUOTED(RXVTNAME,"$RXVTNAME", [Binary base name])
314 383
315RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"` 384RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"`
316AC_SUBST(RXVTNAME) 385AC_SUBST(RXVTNAME)
317 386
318AC_ARG_ENABLE(strings, 387AC_ARG_ENABLE(strings,
… …
325 [ --disable-swapscreen disable swap screen support], 394 [ --disable-swapscreen disable swap screen support],
326 [if test x$enableval = xno; then 395 [if test x$enableval = xno; then
327 AC_DEFINE(NO_SECONDARY_SCREEN, 1, Disable the secondary screen. Many programs use the secondary screen as their workplace) 396 AC_DEFINE(NO_SECONDARY_SCREEN, 1, Disable the secondary screen. Many programs use the secondary screen as their workplace)
328 fi]) 397 fi])
329 398
399AC_ARG_ENABLE(iso14755,
400 [ --enable-iso14755 enable support for extended ISO 14755 modes],
401 [if test x$enableval = xyes -o x$enableval = xno; then
402 support_iso14755=$enableval
403 fi])
404
330AC_ARG_ENABLE(frills, 405AC_ARG_ENABLE(frills,
331 [ --enable-frills enable support for rarely used features], 406 [ --enable-frills enable support for rarely used features],
332 [if test x$enableval = xyes -o x$enableval = xno; then 407 [if test x$enableval = xyes -o x$enableval = xno; then
333 support_frills=$enableval 408 support_frills=$enableval
334 fi])
335
336AC_ARG_ENABLE(linespace,
337 [ --enable-linespace enable support for linespace],
338 [if test x$enableval = xyes -o x$enableval = xno; then
339 support_linespace=$enableval
340 fi]) 409 fi])
341 410
342AC_ARG_ENABLE(24bit, 411AC_ARG_ENABLE(24bit,
343 [ --enable-24bit enable support for using 24bit visuals if available], 412 [ --enable-24bit enable support for using 24bit visuals if available],
344 [if test x$enableval = xyes -o x$enableval = xno; then 413 [if test x$enableval = xyes -o x$enableval = xno; then
… …
392 [ --enable-smart-resize enable smart growth/shrink behaviour], 461 [ --enable-smart-resize enable smart growth/shrink behaviour],
393 [if test x$enableval = xyes; then 462 [if test x$enableval = xyes; then
394 AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior) 463 AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior)
395 fi]) 464 fi])
396 465
397AC_ARG_ENABLE(256-color,
398 [ --enable-256-color enable 256-color support],
399 [if test x$enableval = xyes; then
400 AC_DEFINE(TTY_256COLOR, 1, Define if you want 256 colour support)
401 fi])
402
403AC_ARG_ENABLE(cursor-blink,
404 [ --enable-cursor-blink enable blinking cursor],
405 [if test x$enableval = xyes -o x$enableval = xno; then
406 support_cursor_blink=$enableval
407 fi])
408
409AC_ARG_ENABLE(text-blink, 466AC_ARG_ENABLE(text-blink,
410 [ --enable-text-blink enable blinking text], 467 [ --enable-text-blink enable blinking text],
411 [if test x$enableval = xyes -o x$enableval = xno; then 468 [if test x$enableval = xyes -o x$enableval = xno; then
412 support_text_blink=$enableval 469 support_text_blink=$enableval
413 fi]) 470 fi])
… …
431 fi]) 488 fi])
432 489
433dnl# -------------------------------------------------------------------------- 490dnl# --------------------------------------------------------------------------
434 491
435AC_DEFINE(PROTOTYPES, 1, Define if you need function prototypes) 492AC_DEFINE(PROTOTYPES, 1, Define if you need function prototypes)
436
437dnl# --------------------------------------------------------------------------
438dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
439dnl#
440if test -z "$CFLAGS"; then
441 if test -z "$CCOPTS"; then
442 CCOPTS='-O'
443dnl> if test "x$GCC" = xyes; then
444dnl> if test x$system = xLinux; then
445dnl> CCOPTS="$CCOPTS "'-O2 -fno-strength-reduce'
446dnl> fi
447dnl> fi
448 fi
449 CFLAGS="$CCOPTS"
450fi
451 493
452AC_PATH_PROG(MV, mv, mv) 494AC_PATH_PROG(MV, mv, mv)
453AC_PATH_PROG(RM, rm, rm) 495AC_PATH_PROG(RM, rm, rm)
454AC_PATH_PROG(CP, cp, cp) 496AC_PATH_PROG(CP, cp, cp)
455AC_PATH_PROG(LN, ln, ln) 497AC_PATH_PROG(LN, ln, ln)
456AC_PATH_PROG(SED, sed, sed) 498AC_PATH_PROG(SED, sed, sed)
457AC_PATH_PROG(ECHO, echo, echo) 499AC_PATH_PROG(ECHO, echo, echo)
458AC_PATH_PROG(CMP, cmp, cmp) 500AC_PATH_PROG(CMP, cmp, cmp)
459AC_PATH_PROG(TBL, tbl) 501AC_PATH_PROG(TBL, tbl)
502AC_PATH_PROG(TIC, tic)
460 503
461dnl# need a neat way to detect SVR4 or its features 504dnl# need a neat way to detect SVR4 or its features
462dnl# in src/command.c we use these functions: 505dnl# in src/command.c we use these functions:
463dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> 506dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
464dnl# - but are these also defined for other systems? 507dnl# - but are these also defined for other systems?
… …
501 sys/byteorder.h \ 544 sys/byteorder.h \
502 sys/ioctl.h \ 545 sys/ioctl.h \
503 sys/select.h \ 546 sys/select.h \
504 sys/sockio.h \ 547 sys/sockio.h \
505 sys/strredir.h \ 548 sys/strredir.h \
549 sys/stropts.h \
506 sys/time.h \ 550 sys/time.h \
507 utmp.h \ 551 utmp.h \
508 utmpx.h \ 552 utmpx.h \
509 stdint.h \ 553 stdint.h \
554 pty.h \
555 wchar.h \
556 cwchar \
557 clocale \
510) 558)
511 559
512AC_HEADER_TIME 560AC_HEADER_TIME
513 561
514dnl# check to allow both <termios.h> and <sys/ioctl.h> 562dnl# check to allow both <termios.h> and <sys/ioctl.h>
… …
582dnl> AC_CHECK_TYPE(umode_t, int) 630dnl> AC_CHECK_TYPE(umode_t, int)
583dnl> AC_CHECK_TYPE(off_t, long) 631dnl> AC_CHECK_TYPE(off_t, long)
584AC_TYPE_PID_T 632AC_TYPE_PID_T
585AC_TYPE_UID_T 633AC_TYPE_UID_T
586 634
587
588AC_CHECK_SIZEOF(char, 1)
589AC_CHECK_SIZEOF(short, 2) 635AC_CHECK_SIZEOF(short, 2)
590AC_CHECK_SIZEOF(int, 4) 636AC_CHECK_SIZEOF(int, 4)
591AC_CHECK_SIZEOF(long, 4) 637dnl AC_CHECK_SIZEOF(long, 4)
592AC_CHECK_SIZEOF(long long, 8) 638AC_CHECK_SIZEOF(long long, 8)
593AC_CHECK_SIZEOF(int *, 4) 639AC_CHECK_SIZEOF(int *, 4)
594 640
595dnl# see usage below 641dnl# see usage below
596AC_DEFUN(RXVT_CHECK_SIZE, 642AC_DEFUN(RXVT_CHECK_SIZE,
597 [AC_CACHE_CHECK([for $2], $1, 643 [AC_CACHE_CHECK([for $2], $1,
598 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl 644 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl
599if test $ac_cv_sizeof_char -ge $3; then 645if test "$ac_cv_sizeof_char" -ge $3; then
600 $1="$4 char" 646 $1="$4 char"
601else 647else
602 if test $ac_cv_sizeof_short -ge $3; then 648 if test "$ac_cv_sizeof_short" -ge $3; then
603 $1="$4 short" 649 $1="$4 short"
604 else 650 else
605 if test $ac_cv_sizeof_int -ge $3; then 651 if test "$ac_cv_sizeof_int" -ge $3; then
606 $1="$4 int" 652 $1="$4 int"
607 else 653 else
608 if test $ac_cv_sizeof_long -ge $3; then 654 if test "$ac_cv_sizeof_long" -ge $3; then
609 $1="$4 long" 655 $1="$4 long"
610 else 656 else
611 if test $ac_cv_sizeof_long_long -ge $3; then 657 if test "$ac_cv_sizeof_long_long" -ge $3; then
612 $1="$4 long long" 658 $1="$4 long long"
613 else 659 else
614 $1="$4 $5" # we _must_ have a (possibly wrong) default 660 $1="$4 $5" # we _must_ have a (possibly wrong) default
615 fi 661 fi
616 fi 662 fi
… …
643dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef) 689dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
644dnl AC_SUBST(rxvt_uint64_typedef) 690dnl AC_SUBST(rxvt_uint64_typedef)
645dnl# 691dnl#
646dnl# Now look for another we use 692dnl# Now look for another we use
647dnl# 693dnl#
648if test $ac_cv_sizeof_int_p -eq 8; then 694if test "$ac_cv_sizeof_int_p" -eq 8; then
649 rxvt_intp_define="#define intp_t int64_t" 695 rxvt_intp_define="#define intp_t int64_t"
650 rxvt_u_intp_define="#define u_intp_t u_int64_t" 696 rxvt_u_intp_define="#define u_intp_t u_int64_t"
651else 697else
652 if test $ac_cv_sizeof_int_p -eq 4; then 698 if test "$ac_cv_sizeof_int_p" -eq 4; then
653 rxvt_intp_define="#define intp_t int32_t" 699 rxvt_intp_define="#define intp_t int32_t"
654 rxvt_u_intp_define="#define u_intp_t u_int32_t" 700 rxvt_u_intp_define="#define u_intp_t u_int32_t"
655 else 701 else
656 if test $ac_cv_sizeof_int_p -eq 2; then 702 if test "$ac_cv_sizeof_int_p" -eq 2; then
657 rxvt_intp_define="#define intp_t int16_t" 703 rxvt_intp_define="#define intp_t int16_t"
658 rxvt_u_intp_define="#define u_intp_t u_int16_t" 704 rxvt_u_intp_define="#define u_intp_t u_int16_t"
659 else 705 else
660 rxvt_intp_define="#error set intp_t" 706 rxvt_intp_define="#error set intp_t"
661 rxvt_u_intp_define="#error set u_intp_t" 707 rxvt_u_intp_define="#error set u_intp_t"
… …
693 unlockpt \ 739 unlockpt \
694 isastream \ 740 isastream \
695 on_exit \ 741 on_exit \
696 nanosleep \ 742 nanosleep \
697 updwtmp \ 743 updwtmp \
744 updwtmpx \
698 ttyslot \ 745 ttyslot \
699) 746)
700dnl# Note: On NetBSD, openpty() exists in libutil. Don't pull it in 747dnl# Note: On NetBSD, openpty() exists in libutil. Don't pull it in
701 748
702dnl# -------------------------------------------------------------------------- 749dnl# --------------------------------------------------------------------------
… …
745[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> 792[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
746#include <utmpx.h>]], [[struct utmpx utx; utx.ut_host;]])],[rxvt_cv_struct_utmpx_host=yes],[rxvt_cv_struct_utmpx_host=no])]) 793#include <utmpx.h>]], [[struct utmpx utx; utx.ut_host;]])],[rxvt_cv_struct_utmpx_host=yes],[rxvt_cv_struct_utmpx_host=no])])
747if test x$rxvt_cv_struct_utmpx_host = xyes; then 794if test x$rxvt_cv_struct_utmpx_host = xyes; then
748 AC_DEFINE(HAVE_UTMPX_HOST, 1, Define if struct utmpx contains ut_host) 795 AC_DEFINE(HAVE_UTMPX_HOST, 1, Define if struct utmpx contains ut_host)
749fi 796fi
797
798AC_CACHE_CHECK(for session in utmpx struct, rxvt_cv_struct_utmpx_session,
799[AC_TRY_COMPILE([#include <sys/types.h>
800#include <utmpx.h>],
801[struct utmpx utx; utx.ut_session;],
802rxvt_cv_struct_utmpx_session=yes, rxvt_cv_struct_utmpx_session=no)])
803if test x$rxvt_cv_struct_utmpx_session = xyes; then
804 AC_DEFINE(HAVE_UTMPX_SESSION, 1, Define if struct utmpx contains ut_session)
805fi
750) dnl# AC_CHECK_HEADER(utmpx.h 806) dnl# AC_CHECK_HEADER(utmpx.h
751
752 807
753dnl# -------------------------------------------------------------------------- 808dnl# --------------------------------------------------------------------------
754dnl# check for struct lastlog 809dnl# check for struct lastlog
755AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog, 810AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog,
756[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> 811[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
… …
1066 1121
1067AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo, 1122AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,
1068[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])]) 1123[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])])
1069if test x$rxvt_cv_func_nl_langinfo = xyes; then 1124if test x$rxvt_cv_func_nl_langinfo = xyes; then
1070 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) 1125 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
1126fi
1127
1128AC_CACHE_CHECK(for unix-compliant filehandle passing ability, rxvt_can_pass_fds,
1129[AC_TRY_LINK([
1130#include <sys/types.h>
1131#include <sys/socket.h>
1132],[
1133{
1134 msghdr msg;
1135 iovec iov;
1136 char buf [100];
1137 char data = 0;
1138
1139 iov.iov_base = &data;
1140 iov.iov_len = 1;
1141
1142 msg.msg_iov = &iov;
1143 msg.msg_iovlen = 1;
1144 msg.msg_control = buf;
1145 msg.msg_controllen = sizeof buf;
1146
1147 cmsghdr *cmsg = CMSG_FIRSTHDR (&msg);
1148 cmsg->cmsg_level = SOL_SOCKET;
1149 cmsg->cmsg_type = SCM_RIGHTS;
1150 cmsg->cmsg_len = 100;
1151
1152 *(int *)CMSG_DATA (cmsg) = 5;
1153
1154 return sendmsg (3, &msg, 0);
1155}
1156],[rxvt_can_pass_fds=yes],[rxvt_can_pass_fds=no])])
1157if test x$rxvt_can_pass_fds = xyes; then
1158 AC_DEFINE(HAVE_UNIX_FDPASS, 1, Define if sys/socket.h defines the necessary macros/functions for file handle passing)
1071fi 1159fi
1072 1160
1073AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb, 1161AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
1074[AC_COMPILE_IFELSE([ 1162[AC_COMPILE_IFELSE([
1075#include <X11/Xlib.h> 1163#include <X11/Xlib.h>
… …
1170fi 1258fi
1171 1259
1172dnl# -------------------------------------------------------------------------- 1260dnl# --------------------------------------------------------------------------
1173dnl# now add and remove other stuff 1261dnl# now add and remove other stuff
1174dnl# -------------------------------------------------------------------------- 1262dnl# --------------------------------------------------------------------------
1263if test x$support_xft = xyes; then
1264 LIBS="$LIBS `pkg-config xft --libs`"
1265 CFLAGS="$CFLAGS `pkg-config xft --cflags`"
1266 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
1267
1268 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
1269 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
1270
1271 if test x$support_xft = xyes; then
1272 AC_DEFINE(XFT, 1, Define to enable xft support)
1273 fi
1274fi
1275if test x$support_styles = xyes; then
1276 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
1277fi
1278if test x$support_iso14755 = xyes; then
1279 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
1280fi
1175if test x$support_8bitctrls = xyes; then 1281if test x$support_8bitctrls = xyes; then
1176 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences) 1282 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
1177fi 1283fi
1178if test x$support_fading = xyes; then 1284if test x$support_fading = xyes; then
1179 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) 1285 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
… …
1191 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen) 1297 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)
1192fi 1298fi
1193if test x$support_menubar = xyes; then 1299if test x$support_menubar = xyes; then
1194 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support) 1300 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support)
1195fi 1301fi
1196if test x$support_frills = xno; then 1302if test x$support_frills = xyes; then
1197 AC_DEFINE(NO_FRILLS, 1, Define if you don't want handling for rarely used features) 1303 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
1198fi
1199if test x$support_linespace = xno; then
1200 AC_DEFINE(NO_LINESPACE, 1, Define if you don't want support linespace)
1201fi 1304fi
1202if test x$support_24bit = xyes; then 1305if test x$support_24bit = xyes; then
1203 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) 1306 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)
1204fi 1307fi
1205if test x$support_mousewheel = xyes; then 1308if test x$support_mousewheel = xyes; then
… …
1242 scrolltypes="$scrolltypes plain" 1345 scrolltypes="$scrolltypes plain"
1243fi 1346fi
1244if test x$support_pointer_blank = xyes; then 1347if test x$support_pointer_blank = xyes; then
1245 AC_DEFINE(POINTER_BLANK, 1, Define if you want hide the pointer while typing) 1348 AC_DEFINE(POINTER_BLANK, 1, Define if you want hide the pointer while typing)
1246fi 1349fi
1247if test x$support_cursor_blink = xyes; then
1248 AC_DEFINE(CURSOR_BLINK, 1, Define if you want blinking cursor support)
1249fi
1250if test x$support_text_blink = xyes; then 1350if test x$support_text_blink = xyes; then
1251 AC_DEFINE(TEXT_BLINK, 1, Define if you want blinking text support) 1351 AC_DEFINE(TEXT_BLINK, 1, Define if you want blinking text support)
1252fi 1352fi
1253if test x$support_unicode3 = xyes; then 1353if test x$support_unicode3 = xyes; then
1254 AC_DEFINE(UNICODE_3, 1, Define if you want to represent unicode characters outside plane 0) 1354 AC_DEFINE(UNICODE_3, 1, Define if you want to represent unicode characters outside plane 0)
1255fi 1355fi
1256if test x$support_combining = xyes; then 1356if test x$support_combining = xyes; then
1257 AC_DEFINE(ENABLE_COMBINING, 1, Define if you want to automatically compose combining characters) 1357 AC_DEFINE(ENABLE_COMBINING, 1, Define if you want to automatically compose combining characters)
1258fi 1358fi
1259if test x$codesets = xall; then 1359if test x$codesets = xall; then
1260 codesets=jp,jp-ext,kr,cn,cn-ext 1360 codesets=jp,jp-ext,kr,zh,zh-ext
1261fi 1361fi
1362AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
1363AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
1262for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do 1364for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do
1263 AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
1264 AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
1265 case "$codeset" in 1365 case "$codeset" in
1266 JP ) AC_DEFINE(ENCODING_JP, 1, Define if you want japanese codesets) ;; 1366 JP ) AC_DEFINE(ENCODING_JP, 1, Define if you want japanese codesets) ;;
1267 JP_EXT ) AC_DEFINE(ENCODING_JP_EXT, 1, Define if you want extended japanese codesets) ;; 1367 JP_EXT ) AC_DEFINE(ENCODING_JP_EXT, 1, Define if you want extended japanese codesets) ;;
1268 KR ) AC_DEFINE(ENCODING_KR, 1, Define if you want korean codesets) ;; 1368 KR ) AC_DEFINE(ENCODING_KR, 1, Define if you want korean codesets) ;;
1269 CN ) AC_DEFINE(ENCODING_CN, 1, Define if you want chinese codesets) ;; 1369 ZH ) AC_DEFINE(ENCODING_ZH, 1, Define if you want chinese codesets) ;;
1270 CN_EXT ) AC_DEFINE(ENCODING_CN_EXT, 1, Define if you want extended chinese codesets) ;; 1370 ZH_EXT ) AC_DEFINE(ENCODING_ZH_EXT, 1, Define if you want extended chinese codesets) ;;
1271 esac 1371 esac
1272done 1372done
1273 1373
1274dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket) 1374dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket)
1275 1375
… …
1330RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch) 1430RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch)
1331RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch) 1431RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
1332RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch) 1432RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)
1333RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes) 1433RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
1334 1434
1335if test x$support_xft = xyes; then
1336 LIBS="$LIBS `pkg-config xft --libs`"
1337 CFLAGS="$CFLAGS `pkg-config xft --cflags`"
1338 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
1339
1340 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
1341 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
1342
1343 if test x$support_xft = xyes; then
1344 AC_DEFINE(XFT, 1, Define to enable xft support)
1345 fi
1346fi
1347
1348AC_CONFIG_FILES([autoconf/Make.common \ 1435AC_CONFIG_FILES([autoconf/Make.common \
1349Makefile \ 1436Makefile \
1350doc/Makefile \ 1437doc/Makefile \
1351src/Makefile \ 1438src/Makefile \
1352src/test/Makefile \
1353src/rxvtlib.h \ 1439src/rxvtlib.h \
1354W11/Makefile \
1355]) 1440])
1356AC_OUTPUT 1441AC_OUTPUT
1357 1442
1358echo "Configuration: 1443echo "Configuration:
1359 1444
… …
1429 echo ". functions could not be found. ." 1514 echo ". functions could not be found. ."
1430 echo ". XIM is now being DISABLED! ." 1515 echo ". XIM is now being DISABLED! ."
1431 echo ".----------------------------------------------------------------." 1516 echo ".----------------------------------------------------------------."
1432fi 1517fi
1433 1518
1434echo " *** Please check src/feature.h for further options ***" 1519echo " *** Optionally check src/feature.h for further options ***"
1435echo 1520echo
1436 1521
1437echo ".----------------------------------------------------------------." 1522echo ".----------------------------------------------------------------."
1438echo ". NOTE: most features are disabled by default, try ." 1523echo ". NOTE: some features are disabled by default, try ."
1439echo ". configure --help to get an idea of the optional features ." 1524echo ". configure --help to get an idea of the optional features, ."
1525echo ". or read ./README.configure ."
1526echo ". ."
1527echo ". The script ./reconf gives a reasonable baseline, try it if ."
1528echo ". you do not want to read documentation and still want some ."
1529echo ". useful features. ."
1440echo ".----------------------------------------------------------------." 1530echo ".----------------------------------------------------------------."
1441echo 1531echo
1442 1532

Diff Legend

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