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.33 by root, Sun Aug 15 04:42:46 2004 UTC vs.
Revision 1.54 by root, Tue Oct 25 20:04:58 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#
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
… …
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_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])
62AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"]) 84AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])
63 85
64AC_ENABLE_SHARED(no)dnl# libtool 86dnl AC_ENABLE_SHARED(no)dnl# libtool
65AC_ENABLE_STATIC(yes)dnl# libtool 87dnl AC_ENABLE_STATIC(yes)dnl# libtool
66AC_PROG_LIBTOOL()dnl# libtool 88dnl AC_PROG_LIBTOOL()dnl# libtool
67 89
68MALLOC_TYPE=S 90MALLOC_TYPE=S
91
69support_addstrings=no 92support_addstrings=no
70support_frills=no 93support_frills=yes
71support_linespace=no
72support_inheritpixmap=no 94support_inheritpixmap=no
73support_tinting=no 95support_tinting=yes
74support_fading=no 96support_fading=yes
75support_keepscrolling=no 97support_keepscrolling=yes
76support_selectionscrolling=no 98support_selectionscrolling=yes
77support_menubar=no 99support_menubar=no
78support_mousewheel=no 100support_mousewheel=yes
79support_mouseslipwheel=no 101support_mouseslipwheel=yes
80support_utmp=no 102support_utmp=yes
81support_wtmp=no 103support_wtmp=yes
82support_lastlog=no 104support_lastlog=yes
83support_cursor_blink=no
84support_text_blink=no 105support_text_blink=yes
85support_pointer_blank=no 106support_pointer_blank=yes
86support_scroll_rxvt=no 107support_scroll_rxvt=yes
87support_scroll_next=no 108support_scroll_next=yes
88support_scroll_xterm=no 109support_scroll_xterm=yes
89support_scroll_plain=no 110support_scroll_plain=yes
90support_xim=no 111support_xim=yes
91support_xpm=no 112support_xpm=no
92support_xft=no 113support_xft=yes
93support_unicode3=no 114support_unicode3=no
94support_combining=no 115support_combining=yes
95support_8bitctrls=no 116support_8bitctrls=no
96support_iso14755=no 117support_iso14755=yes
118support_styles=yes
97codesets= 119codesets=all
98 120
99dnl# -------------------------------------------------------------------------- 121dnl# --------------------------------------------------------------------------
100dnl# CHECKING COMMAND LINE OPTIONS 122dnl# CHECKING COMMAND LINE OPTIONS
101dnl# -------------------------------------------------------------------------- 123dnl# --------------------------------------------------------------------------
102 124
… …
108 130
109AC_ARG_ENABLE(everything, 131AC_ARG_ENABLE(everything,
110 [ --enable-everything enable standard non-multichoice features 132 [ --enable-everything enable standard non-multichoice features
111 NOTE: this option is order dependent 133 NOTE: this option is order dependent
112 NOTE: automatically enabled with --enable-shared], 134 NOTE: automatically enabled with --enable-shared],
135 [
136 if test x$enableval = xno; then
137 support_24bit=no
138 support_frills=no
139 support_inheritpixmap=no
140 support_tinting=no
141 support_fading=no
142 support_keepscrolling=no
143 support_selectionscrolling=no
144 support_lastlog=no
145 support_menubar=no
146 support_mousewheel=no
147 support_mouseslipwheel=no
148 support_text_blink=no
149 support_pointer_blank=no
150 support_scroll_rxvt=no
151 support_scroll_next=no
152 support_scroll_xterm=no
153 support_scroll_plain=no
154 support_utmp=no
155 support_wtmp=no
156 support_xim=no
157 support_xpm=no
158 support_xft=no
159 support_unicode3=no
160 support_combining=no
161 support_8bitctrls=no
162 support_iso14755=no
163 support_styles=no
164 codesets=
165 fi
113 [if test x$enableval = xyes; then 166 if test x$enableval = xyes; then
114 support_24bit=yes 167 support_24bit=yes
115 support_frills=yes 168 support_frills=yes
116 support_linespace=yes
117 support_inheritpixmap=yes 169 support_inheritpixmap=yes
118 support_tinting=yes 170 support_tinting=yes
119 support_fading=yes 171 support_fading=yes
120 support_keepscrolling=yes 172 support_keepscrolling=yes
121 support_selectionscrolling=yes 173 support_selectionscrolling=yes
122 support_lastlog=yes 174 support_lastlog=yes
123 support_menubar=yes 175 support_menubar=yes
124 support_mousewheel=yes 176 support_mousewheel=yes
125 support_mouseslipwheel=yes 177 support_mouseslipwheel=yes
126 support_cursor_blink=yes
127 support_text_blink=yes 178 support_text_blink=yes
128 support_pointer_blank=yes 179 support_pointer_blank=yes
129 support_scroll_rxvt=yes 180 support_scroll_rxvt=yes
130 support_scroll_next=yes 181 support_scroll_next=yes
131 support_scroll_xterm=yes 182 support_scroll_xterm=yes
132 support_scroll_plain=yes 183 support_scroll_plain=yes
133 support_utmp=yes 184 support_utmp=yes
134 support_wtmp=yes 185 support_wtmp=yes
135 support_xim=yes 186 support_xim=yes
136 support_xpm=yes 187 support_xpm=yes
137 support_xft=yes 188 support_xft=yes
138 support_unicode3=yes 189 support_unicode3=yes
139 support_combining=yes 190 support_combining=yes
140 #support_8bitctrls=yes 191 #support_8bitctrls=yes
141 support_iso14755=yes 192 support_iso14755=yes
193 support_styles=yes
142 codesets=all 194 codesets=all
195 fi
143 fi]) 196 ])
144 197
145AC_ARG_ENABLE(unicode3, 198AC_ARG_ENABLE(unicode3,
146 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters], 199 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters],
147 [if test x$enableval = xyes -o x$enableval = xno; then 200 [if test x$enableval = xyes -o x$enableval = xno; then
148 support_unicode3=yes 201 support_unicode3=$enableval
149 fi]) 202 fi])
150 203
151AC_ARG_ENABLE(combining, 204AC_ARG_ENABLE(combining,
152 [ --enable-combining enable composition of base and combining characters], 205 [ --enable-combining enable composition of base and combining characters],
153 [if test x$enableval = xyes -o x$enableval = xno; then 206 [if test x$enableval = xyes -o x$enableval = xno; then
154 support_combining=yes 207 support_combining=$enableval
155 fi]) 208 fi])
156 209
157AC_ARG_ENABLE(xft, 210AC_ARG_ENABLE(xft,
158 [ --enable-xft enable xft support on systems that have it], 211 [ --enable-xft enable xft support on systems that have it],
159 [if test x$enableval = xyes -o x$enableval = xno; then 212 [if test x$enableval = xyes -o x$enableval = xno; then
160 support_xft=yes 213 support_xft=$enableval
214 fi])
215
216AC_ARG_ENABLE(font-styles,
217 [ --enable-font-styles enable bold and italic support],
218 [if test x$enableval = xyes -o x$enableval = xno; then
219 support_styles=$enableval
161 fi]) 220 fi])
162 221
163AC_ARG_ENABLE(utmp, 222AC_ARG_ENABLE(utmp,
164 [ --enable-utmp enable utmp (utmpx) support], 223 [ --enable-utmp enable utmp (utmpx) support],
165 [if test x$enableval = xyes -o x$enableval = xno; then 224 [if test x$enableval = xyes -o x$enableval = xno; then
… …
237 [if test x$enableval = xyes; then 296 [if test x$enableval = xyes; then
238 AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less) 297 AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less)
239 fi]) 298 fi])
240 299
241AC_ARG_WITH(codesets, 300AC_ARG_WITH(codesets,
242 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,cn,cn_ext,all)], 301 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
243 [codesets="$withval"]) 302 [codesets="$withval"])
244 303
245AC_ARG_ENABLE(xim, 304AC_ARG_ENABLE(xim,
246 [ --enable-xim XIM (X Input Method) protocol support], 305 [ --enable-xim XIM (X Input Method) protocol support],
247 [if test x$enableval = xyes -o x$enableval = xno; then 306 [if test x$enableval = xyes -o x$enableval = xno; then
… …
279 fi]) 338 fi])
280 339
281AC_ARG_ENABLE(8bitctrls, 340AC_ARG_ENABLE(8bitctrls,
282 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)], 341 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)],
283 [if test x$enableval = xyes -o x$enableval = xno; then 342 [if test x$enableval = xyes -o x$enableval = xno; then
284 support_8bitctrls=yes 343 support_8bitctrls=$enableval
285 fi]) 344 fi])
286 345
287RESFALLBACK=Rxvt 346RESFALLBACK=Rxvt
288AC_ARG_ENABLE(fallback, 347AC_ARG_ENABLE(fallback,
289 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)], 348 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)],
… …
311 370
312RXVTNAME=urxvt 371RXVTNAME=urxvt
313AC_ARG_WITH(name, 372AC_ARG_WITH(name,
314 [ --with-name=NAME set the basename for the installed binaries (default: urxvt)], 373 [ --with-name=NAME set the basename for the installed binaries (default: urxvt)],
315 [RXVTNAME="$withval"]) 374 [RXVTNAME="$withval"])
375AC_DEFINE_UNQUOTED(RXVTNAME,"$RXVTNAME", [Binary base name])
316 376
317RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"` 377RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"`
318AC_SUBST(RXVTNAME) 378AC_SUBST(RXVTNAME)
319 379
320AC_ARG_ENABLE(strings, 380AC_ARG_ENABLE(strings,
… …
337 397
338AC_ARG_ENABLE(frills, 398AC_ARG_ENABLE(frills,
339 [ --enable-frills enable support for rarely used features], 399 [ --enable-frills enable support for rarely used features],
340 [if test x$enableval = xyes -o x$enableval = xno; then 400 [if test x$enableval = xyes -o x$enableval = xno; then
341 support_frills=$enableval 401 support_frills=$enableval
342 fi])
343
344AC_ARG_ENABLE(linespace,
345 [ --enable-linespace enable support for linespace],
346 [if test x$enableval = xyes -o x$enableval = xno; then
347 support_linespace=$enableval
348 fi]) 402 fi])
349 403
350AC_ARG_ENABLE(24bit, 404AC_ARG_ENABLE(24bit,
351 [ --enable-24bit enable support for using 24bit visuals if available], 405 [ --enable-24bit enable support for using 24bit visuals if available],
352 [if test x$enableval = xyes -o x$enableval = xno; then 406 [if test x$enableval = xyes -o x$enableval = xno; then
… …
400 [ --enable-smart-resize enable smart growth/shrink behaviour], 454 [ --enable-smart-resize enable smart growth/shrink behaviour],
401 [if test x$enableval = xyes; then 455 [if test x$enableval = xyes; then
402 AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior) 456 AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior)
403 fi]) 457 fi])
404 458
405AC_ARG_ENABLE(256-color,
406 [ --enable-256-color enable 256-color support],
407 [if test x$enableval = xyes; then
408 AC_DEFINE(TTY_256COLOR, 1, Define if you want 256 colour support)
409 fi])
410
411AC_ARG_ENABLE(cursor-blink,
412 [ --enable-cursor-blink enable blinking cursor],
413 [if test x$enableval = xyes -o x$enableval = xno; then
414 support_cursor_blink=$enableval
415 fi])
416
417AC_ARG_ENABLE(text-blink, 459AC_ARG_ENABLE(text-blink,
418 [ --enable-text-blink enable blinking text], 460 [ --enable-text-blink enable blinking text],
419 [if test x$enableval = xyes -o x$enableval = xno; then 461 [if test x$enableval = xyes -o x$enableval = xno; then
420 support_text_blink=$enableval 462 support_text_blink=$enableval
421 fi]) 463 fi])
… …
439 fi]) 481 fi])
440 482
441dnl# -------------------------------------------------------------------------- 483dnl# --------------------------------------------------------------------------
442 484
443AC_DEFINE(PROTOTYPES, 1, Define if you need function prototypes) 485AC_DEFINE(PROTOTYPES, 1, Define if you need function prototypes)
444
445dnl# --------------------------------------------------------------------------
446dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
447dnl#
448if test -z "$CFLAGS"; then
449 if test -z "$CCOPTS"; then
450 CCOPTS='-O'
451dnl> if test "x$GCC" = xyes; then
452dnl> if test x$system = xLinux; then
453dnl> CCOPTS="$CCOPTS "'-O2 -fno-strength-reduce'
454dnl> fi
455dnl> fi
456 fi
457 CFLAGS="$CCOPTS"
458fi
459 486
460AC_PATH_PROG(MV, mv, mv) 487AC_PATH_PROG(MV, mv, mv)
461AC_PATH_PROG(RM, rm, rm) 488AC_PATH_PROG(RM, rm, rm)
462AC_PATH_PROG(CP, cp, cp) 489AC_PATH_PROG(CP, cp, cp)
463AC_PATH_PROG(LN, ln, ln) 490AC_PATH_PROG(LN, ln, ln)
464AC_PATH_PROG(SED, sed, sed) 491AC_PATH_PROG(SED, sed, sed)
465AC_PATH_PROG(ECHO, echo, echo) 492AC_PATH_PROG(ECHO, echo, echo)
466AC_PATH_PROG(CMP, cmp, cmp) 493AC_PATH_PROG(CMP, cmp, cmp)
467AC_PATH_PROG(TBL, tbl) 494AC_PATH_PROG(TBL, tbl)
495AC_PATH_PROG(TIC, tic)
468 496
469dnl# need a neat way to detect SVR4 or its features 497dnl# need a neat way to detect SVR4 or its features
470dnl# in src/command.c we use these functions: 498dnl# in src/command.c we use these functions:
471dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> 499dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
472dnl# - but are these also defined for other systems? 500dnl# - but are these also defined for other systems?
… …
514 sys/stropts.h \ 542 sys/stropts.h \
515 sys/time.h \ 543 sys/time.h \
516 utmp.h \ 544 utmp.h \
517 utmpx.h \ 545 utmpx.h \
518 stdint.h \ 546 stdint.h \
547 pty.h \
548 wchar.h \
549 cwchar \
550 clocale \
519) 551)
520 552
521AC_HEADER_TIME 553AC_HEADER_TIME
522 554
523dnl# check to allow both <termios.h> and <sys/ioctl.h> 555dnl# check to allow both <termios.h> and <sys/ioctl.h>
… …
591dnl> AC_CHECK_TYPE(umode_t, int) 623dnl> AC_CHECK_TYPE(umode_t, int)
592dnl> AC_CHECK_TYPE(off_t, long) 624dnl> AC_CHECK_TYPE(off_t, long)
593AC_TYPE_PID_T 625AC_TYPE_PID_T
594AC_TYPE_UID_T 626AC_TYPE_UID_T
595 627
596AC_CHECK_SIZEOF(char, 1)
597AC_CHECK_SIZEOF(short, 2) 628AC_CHECK_SIZEOF(short, 2)
598AC_CHECK_SIZEOF(int, 4) 629AC_CHECK_SIZEOF(int, 4)
599AC_CHECK_SIZEOF(long, 4) 630dnl AC_CHECK_SIZEOF(long, 4)
600AC_CHECK_SIZEOF(long long, 8) 631AC_CHECK_SIZEOF(long long, 8)
601AC_CHECK_SIZEOF(int *, 4) 632AC_CHECK_SIZEOF(int *, 4)
602 633
603dnl# see usage below 634dnl# see usage below
604AC_DEFUN(RXVT_CHECK_SIZE, 635AC_DEFUN(RXVT_CHECK_SIZE,
605 [AC_CACHE_CHECK([for $2], $1, 636 [AC_CACHE_CHECK([for $2], $1,
606 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl 637 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl
607if test $ac_cv_sizeof_char -ge $3; then 638if test "$ac_cv_sizeof_char" -ge $3; then
608 $1="$4 char" 639 $1="$4 char"
609else 640else
610 if test $ac_cv_sizeof_short -ge $3; then 641 if test "$ac_cv_sizeof_short" -ge $3; then
611 $1="$4 short" 642 $1="$4 short"
612 else 643 else
613 if test $ac_cv_sizeof_int -ge $3; then 644 if test "$ac_cv_sizeof_int" -ge $3; then
614 $1="$4 int" 645 $1="$4 int"
615 else 646 else
616 if test $ac_cv_sizeof_long -ge $3; then 647 if test "$ac_cv_sizeof_long" -ge $3; then
617 $1="$4 long" 648 $1="$4 long"
618 else 649 else
619 if test $ac_cv_sizeof_long_long -ge $3; then 650 if test "$ac_cv_sizeof_long_long" -ge $3; then
620 $1="$4 long long" 651 $1="$4 long long"
621 else 652 else
622 $1="$4 $5" # we _must_ have a (possibly wrong) default 653 $1="$4 $5" # we _must_ have a (possibly wrong) default
623 fi 654 fi
624 fi 655 fi
… …
651dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef) 682dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
652dnl AC_SUBST(rxvt_uint64_typedef) 683dnl AC_SUBST(rxvt_uint64_typedef)
653dnl# 684dnl#
654dnl# Now look for another we use 685dnl# Now look for another we use
655dnl# 686dnl#
656if test $ac_cv_sizeof_int_p -eq 8; then 687if test "$ac_cv_sizeof_int_p" -eq 8; then
657 rxvt_intp_define="#define intp_t int64_t" 688 rxvt_intp_define="#define intp_t int64_t"
658 rxvt_u_intp_define="#define u_intp_t u_int64_t" 689 rxvt_u_intp_define="#define u_intp_t u_int64_t"
659else 690else
660 if test $ac_cv_sizeof_int_p -eq 4; then 691 if test "$ac_cv_sizeof_int_p" -eq 4; then
661 rxvt_intp_define="#define intp_t int32_t" 692 rxvt_intp_define="#define intp_t int32_t"
662 rxvt_u_intp_define="#define u_intp_t u_int32_t" 693 rxvt_u_intp_define="#define u_intp_t u_int32_t"
663 else 694 else
664 if test $ac_cv_sizeof_int_p -eq 2; then 695 if test "$ac_cv_sizeof_int_p" -eq 2; then
665 rxvt_intp_define="#define intp_t int16_t" 696 rxvt_intp_define="#define intp_t int16_t"
666 rxvt_u_intp_define="#define u_intp_t u_int16_t" 697 rxvt_u_intp_define="#define u_intp_t u_int16_t"
667 else 698 else
668 rxvt_intp_define="#error set intp_t" 699 rxvt_intp_define="#error set intp_t"
669 rxvt_u_intp_define="#error set u_intp_t" 700 rxvt_u_intp_define="#error set u_intp_t"
… …
701 unlockpt \ 732 unlockpt \
702 isastream \ 733 isastream \
703 on_exit \ 734 on_exit \
704 nanosleep \ 735 nanosleep \
705 updwtmp \ 736 updwtmp \
737 updwtmpx \
706 ttyslot \ 738 ttyslot \
707) 739)
708dnl# Note: On NetBSD, openpty() exists in libutil. Don't pull it in 740dnl# Note: On NetBSD, openpty() exists in libutil. Don't pull it in
709 741
710dnl# -------------------------------------------------------------------------- 742dnl# --------------------------------------------------------------------------
… …
753[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> 785[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
754#include <utmpx.h>]], [[struct utmpx utx; utx.ut_host;]])],[rxvt_cv_struct_utmpx_host=yes],[rxvt_cv_struct_utmpx_host=no])]) 786#include <utmpx.h>]], [[struct utmpx utx; utx.ut_host;]])],[rxvt_cv_struct_utmpx_host=yes],[rxvt_cv_struct_utmpx_host=no])])
755if test x$rxvt_cv_struct_utmpx_host = xyes; then 787if test x$rxvt_cv_struct_utmpx_host = xyes; then
756 AC_DEFINE(HAVE_UTMPX_HOST, 1, Define if struct utmpx contains ut_host) 788 AC_DEFINE(HAVE_UTMPX_HOST, 1, Define if struct utmpx contains ut_host)
757fi 789fi
790
791AC_CACHE_CHECK(for session in utmpx struct, rxvt_cv_struct_utmpx_session,
792[AC_TRY_COMPILE([#include <sys/types.h>
793#include <utmpx.h>],
794[struct utmpx utx; utx.ut_session;],
795rxvt_cv_struct_utmpx_session=yes, rxvt_cv_struct_utmpx_session=no)])
796if test x$rxvt_cv_struct_utmpx_session = xyes; then
797 AC_DEFINE(HAVE_UTMPX_SESSION, 1, Define if struct utmpx contains ut_session)
798fi
758) dnl# AC_CHECK_HEADER(utmpx.h 799) dnl# AC_CHECK_HEADER(utmpx.h
759
760 800
761dnl# -------------------------------------------------------------------------- 801dnl# --------------------------------------------------------------------------
762dnl# check for struct lastlog 802dnl# check for struct lastlog
763AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog, 803AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog,
764[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> 804[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
… …
1178fi 1218fi
1179 1219
1180dnl# -------------------------------------------------------------------------- 1220dnl# --------------------------------------------------------------------------
1181dnl# now add and remove other stuff 1221dnl# now add and remove other stuff
1182dnl# -------------------------------------------------------------------------- 1222dnl# --------------------------------------------------------------------------
1223if test x$support_xft = xyes; then
1224 LIBS="$LIBS `pkg-config xft --libs`"
1225 CFLAGS="$CFLAGS `pkg-config xft --cflags`"
1226 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
1227
1228 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
1229 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
1230
1231 if test x$support_xft = xyes; then
1232 AC_DEFINE(XFT, 1, Define to enable xft support)
1233 fi
1234fi
1235if test x$support_styles = xyes; then
1236 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
1237fi
1183if test x$support_iso14755 = xyes; then 1238if test x$support_iso14755 = xyes; then
1184 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support) 1239 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
1185fi 1240fi
1186if test x$support_8bitctrls = xyes; then 1241if test x$support_8bitctrls = xyes; then
1187 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences) 1242 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
… …
1204if test x$support_menubar = xyes; then 1259if test x$support_menubar = xyes; then
1205 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support) 1260 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support)
1206fi 1261fi
1207if test x$support_frills = xyes; then 1262if test x$support_frills = xyes; then
1208 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features) 1263 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
1209fi
1210if test x$support_linespace = xno; then
1211 AC_DEFINE(NO_LINESPACE, 1, Define if you don't want support linespace)
1212fi 1264fi
1213if test x$support_24bit = xyes; then 1265if test x$support_24bit = xyes; then
1214 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) 1266 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)
1215fi 1267fi
1216if test x$support_mousewheel = xyes; then 1268if test x$support_mousewheel = xyes; then
… …
1253 scrolltypes="$scrolltypes plain" 1305 scrolltypes="$scrolltypes plain"
1254fi 1306fi
1255if test x$support_pointer_blank = xyes; then 1307if test x$support_pointer_blank = xyes; then
1256 AC_DEFINE(POINTER_BLANK, 1, Define if you want hide the pointer while typing) 1308 AC_DEFINE(POINTER_BLANK, 1, Define if you want hide the pointer while typing)
1257fi 1309fi
1258if test x$support_cursor_blink = xyes; then
1259 AC_DEFINE(CURSOR_BLINK, 1, Define if you want blinking cursor support)
1260fi
1261if test x$support_text_blink = xyes; then 1310if test x$support_text_blink = xyes; then
1262 AC_DEFINE(TEXT_BLINK, 1, Define if you want blinking text support) 1311 AC_DEFINE(TEXT_BLINK, 1, Define if you want blinking text support)
1263fi 1312fi
1264if test x$support_unicode3 = xyes; then 1313if test x$support_unicode3 = xyes; then
1265 AC_DEFINE(UNICODE_3, 1, Define if you want to represent unicode characters outside plane 0) 1314 AC_DEFINE(UNICODE_3, 1, Define if you want to represent unicode characters outside plane 0)
1266fi 1315fi
1267if test x$support_combining = xyes; then 1316if test x$support_combining = xyes; then
1268 AC_DEFINE(ENABLE_COMBINING, 1, Define if you want to automatically compose combining characters) 1317 AC_DEFINE(ENABLE_COMBINING, 1, Define if you want to automatically compose combining characters)
1269fi 1318fi
1270if test x$codesets = xall; then 1319if test x$codesets = xall; then
1271 codesets=jp,jp-ext,kr,cn,cn-ext 1320 codesets=jp,jp-ext,kr,zh,zh-ext
1272fi 1321fi
1273AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets) 1322AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
1274AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets) 1323AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
1275for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do 1324for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do
1276 case "$codeset" in 1325 case "$codeset" in
1277 JP ) AC_DEFINE(ENCODING_JP, 1, Define if you want japanese codesets) ;; 1326 JP ) AC_DEFINE(ENCODING_JP, 1, Define if you want japanese codesets) ;;
1278 JP_EXT ) AC_DEFINE(ENCODING_JP_EXT, 1, Define if you want extended japanese codesets) ;; 1327 JP_EXT ) AC_DEFINE(ENCODING_JP_EXT, 1, Define if you want extended japanese codesets) ;;
1279 KR ) AC_DEFINE(ENCODING_KR, 1, Define if you want korean codesets) ;; 1328 KR ) AC_DEFINE(ENCODING_KR, 1, Define if you want korean codesets) ;;
1280 CN ) AC_DEFINE(ENCODING_CN, 1, Define if you want chinese codesets) ;; 1329 ZH ) AC_DEFINE(ENCODING_ZH, 1, Define if you want chinese codesets) ;;
1281 CN_EXT ) AC_DEFINE(ENCODING_CN_EXT, 1, Define if you want extended chinese codesets) ;; 1330 ZH_EXT ) AC_DEFINE(ENCODING_ZH_EXT, 1, Define if you want extended chinese codesets) ;;
1282 esac 1331 esac
1283done 1332done
1284 1333
1285dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket) 1334dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket)
1286 1335
… …
1341RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch) 1390RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch)
1342RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch) 1391RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
1343RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch) 1392RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)
1344RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes) 1393RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
1345 1394
1346if test x$support_xft = xyes; then
1347 LIBS="$LIBS `pkg-config xft --libs`"
1348 CFLAGS="$CFLAGS `pkg-config xft --cflags`"
1349 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
1350
1351 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
1352 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
1353
1354 if test x$support_xft = xyes; then
1355 AC_DEFINE(XFT, 1, Define to enable xft support)
1356 fi
1357fi
1358
1359AC_CONFIG_FILES([autoconf/Make.common \ 1395AC_CONFIG_FILES([autoconf/Make.common \
1360Makefile \ 1396Makefile \
1361doc/Makefile \ 1397doc/Makefile \
1362src/Makefile \ 1398src/Makefile \
1363src/test/Makefile \
1364src/rxvtlib.h \ 1399src/rxvtlib.h \
1365W11/Makefile \
1366]) 1400])
1367AC_OUTPUT 1401AC_OUTPUT
1368 1402
1369echo "Configuration: 1403echo "Configuration:
1370 1404
… …
1440 echo ". functions could not be found. ." 1474 echo ". functions could not be found. ."
1441 echo ". XIM is now being DISABLED! ." 1475 echo ". XIM is now being DISABLED! ."
1442 echo ".----------------------------------------------------------------." 1476 echo ".----------------------------------------------------------------."
1443fi 1477fi
1444 1478
1445echo " *** Please check src/feature.h for further options ***" 1479echo " *** Optionally check src/feature.h for further options ***"
1446echo 1480echo
1447 1481
1448echo ".----------------------------------------------------------------." 1482echo ".----------------------------------------------------------------."
1449echo ". NOTE: most features are disabled by default, try ." 1483echo ". NOTE: most features are disabled by default, try ."
1450echo ". configure --help to get an idea of the optional features ." 1484echo ". configure --help to get an idea of the optional features, ."
1485echo ". or read ./README.configure ."
1486echo ". ."
1487echo ". The script ./reconf gives a reasonable baseline, try it if ."
1488echo ". you do not want to read documentation and still want some ."
1489echo ". useful features. ."
1451echo ".----------------------------------------------------------------." 1490echo ".----------------------------------------------------------------."
1452echo 1491echo
1453 1492

Diff Legend

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