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.12 by pcg, Sun Feb 22 08:09:36 2004 UTC vs.
Revision 1.34 by root, Tue Aug 17 08:47:56 2004 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) 5AC_INIT
6AC_CONFIG_SRCDIR([src/feature.h])
6AC_CONFIG_AUX_DIR(autoconf) 7AC_CONFIG_AUX_DIR(autoconf)
7AC_CONFIG_HEADER(config.h:autoconf/config.h.in) 8AC_CONFIG_HEADER(config.h:autoconf/config.h.in)
8 9
9dnl RXVT version 10dnl RXVT version
10changequote(, )dnl 11changequote(, )dnl
28AC_PROG_CXX 29AC_PROG_CXX
29AC_PROG_CPP 30AC_PROG_CPP
30AC_PROG_INSTALL 31AC_PROG_INSTALL
31AC_PROG_AWK 32AC_PROG_AWK
32 33
34AC_LANG(C)
35
36LINKER="$CXX"
37if test x$GCC = xyes && test x$GXX = xyes; then
38 AC_CHECK_LIB(supc++, main, [
39 LINKER="$CC"
40 LIBS="$LIBS -lsupc++"
41 ])
42fi
43AC_SUBST(LINKER,[$LINKER])
44
45CPPFLAGS="-D_GNU_SOURCE -D_XOPEN_SOURCE"
46
47dnl if test x$GXX = xyes; then
48dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now...
49dnl fi
50
51AC_LANG(C++)
52
33dnl# system hacks 53dnl# system hacks
34AC_AIX 54AC_AIX
35AC_ISC_POSIX 55AC_ISC_POSIX
56
57dnl# FreeBSD needs to link libxpg4
58AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])
59
60dnl solaris needs to link libnsl and socket
61AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])
62AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])
36 63
37AC_ENABLE_SHARED(no)dnl# libtool 64AC_ENABLE_SHARED(no)dnl# libtool
38AC_ENABLE_STATIC(yes)dnl# libtool 65AC_ENABLE_STATIC(yes)dnl# libtool
39AC_PROG_LIBTOOL()dnl# libtool 66AC_PROG_LIBTOOL()dnl# libtool
40 67
41MALLOC_TYPE=S 68MALLOC_TYPE=S
42support_addstrings=no 69support_addstrings=no
43support_frills=no 70support_frills=no
44support_linespace=no 71support_linespace=no
45support_inheritpixmap=no 72support_inheritpixmap=no
73support_tinting=no
74support_fading=no
46support_keepscrolling=no 75support_keepscrolling=no
47support_selectionscrolling=no 76support_selectionscrolling=no
48support_menubar=no 77support_menubar=no
49support_mousewheel=no 78support_mousewheel=no
50support_mouseslipwheel=no 79support_mouseslipwheel=no
51support_oldselection=no
52support_utmp=no 80support_utmp=no
53support_wtmp=no 81support_wtmp=no
54support_lastlog=no 82support_lastlog=no
55support_cursor_blink=no 83support_cursor_blink=no
56support_text_blink=no 84support_text_blink=no
61support_scroll_plain=no 89support_scroll_plain=no
62support_xim=no 90support_xim=no
63support_xpm=no 91support_xpm=no
64support_xft=no 92support_xft=no
65support_unicode3=no 93support_unicode3=no
94support_combining=no
95support_8bitctrls=no
96support_iso14755=no
66codesets= 97codesets=
67 98
68dnl# -------------------------------------------------------------------------- 99dnl# --------------------------------------------------------------------------
69dnl# CHECKING COMMAND LINE OPTIONS 100dnl# CHECKING COMMAND LINE OPTIONS
70dnl# -------------------------------------------------------------------------- 101dnl# --------------------------------------------------------------------------
74 INSTALL_LIBRXVT=yes 105 INSTALL_LIBRXVT=yes
75fi 106fi
76AC_SUBST(INSTALL_LIBRXVT) 107AC_SUBST(INSTALL_LIBRXVT)
77 108
78AC_ARG_ENABLE(everything, 109AC_ARG_ENABLE(everything,
79 [ --enable-everything enable standard non-multichoice features: marked * 110 [ --enable-everything enable standard non-multichoice features
80 NOTE: this option is order dependent 111 NOTE: this option is order dependent
81 NOTE: automatically enabled with --enable-shared], 112 NOTE: automatically enabled with --enable-shared],
82 [if test x$enableval = xyes; then 113 [if test x$enableval = xyes; then
83 support_24bit=yes 114 support_24bit=yes
84 support_frills=yes 115 support_frills=yes
85 support_linespace=yes 116 support_linespace=yes
86 support_inheritpixmap=yes 117 support_inheritpixmap=yes
118 support_tinting=yes
119 support_fading=yes
87 support_keepscrolling=yes 120 support_keepscrolling=yes
88 support_selectionscrolling=yes 121 support_selectionscrolling=yes
89 support_lastlog=yes 122 support_lastlog=yes
90 support_menubar=yes 123 support_menubar=yes
91 support_mousewheel=yes 124 support_mousewheel=yes
92 support_mouseslipwheel=yes 125 support_mouseslipwheel=yes
93 support_oldselection=yes
94 support_cursor_blink=yes 126 support_cursor_blink=yes
95 support_text_blink=yes 127 support_text_blink=yes
96 support_pointer_blank=yes 128 support_pointer_blank=yes
97 support_scroll_rxvt=yes 129 support_scroll_rxvt=yes
98 support_scroll_next=yes 130 support_scroll_next=yes
102 support_wtmp=yes 134 support_wtmp=yes
103 support_xim=yes 135 support_xim=yes
104 support_xpm=yes 136 support_xpm=yes
105 support_xft=yes 137 support_xft=yes
106 support_unicode3=yes 138 support_unicode3=yes
139 support_combining=yes
140 #support_8bitctrls=yes
141 support_iso14755=yes
107 codesets=all 142 codesets=all
108 fi]) 143 fi])
109
110echo
111if test x$support_menubar = xyes; then
112 support_menubar=no
113 echo "******* menubar support disabled, does not work"
114fi
115echo
116 144
117AC_ARG_ENABLE(unicode3, 145AC_ARG_ENABLE(unicode3,
118 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters], 146 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters],
119 [if test x$enableval = xyes; then 147 [if test x$enableval = xyes -o x$enableval = xno; then
120 support_unicode3=yes 148 support_unicode3=yes
121 fi]) 149 fi])
122 150
151AC_ARG_ENABLE(combining,
152 [ --enable-combining enable composition of base and combining characters],
153 [if test x$enableval = xyes -o x$enableval = xno; then
154 support_combining=yes
155 fi])
156
123AC_ARG_ENABLE(xft, 157AC_ARG_ENABLE(xft,
124 [ --enable-xft enable xft support on systems that have it], 158 [ --enable-xft enable xft support on systems that have it],
125 [if test x$enableval = xyes; then 159 [if test x$enableval = xyes -o x$enableval = xno; then
126 support_xft=yes 160 support_xft=yes
127 fi])
128
129AC_ARG_WITH(codesets,
130 [ --with-codesets=NAME,... compile in additional codesets (jp,jp_ext,kr,cn,cn_ext,vn,all)],
131 [if test x$enableval = xyes; then
132 codesets="$withval"
133 fi])
134
135AC_ARG_WITH(encoding,
136 [ --with-encoding=NAME set language default encoding to NAME (default: sjis)
137 (eucj|sjis|big5|gb|kr|noenc)],
138 [if test x$enableval = xyes; then
139 withval=`echo $withval | tr '[a-z]' '[A-Z]'`
140 AC_DEFINE_UNQUOTED(MULTICHAR_ENCODING, $withval, Define default multichar glyph encoding)
141 fi]) 161 fi])
142 162
143AC_ARG_ENABLE(utmp, 163AC_ARG_ENABLE(utmp,
144 [ --enable-utmp enable utmp (utmpx) support], 164 [ --enable-utmp enable utmp (utmpx) support],
145 [if test x$enableval = xyes -o x$enableval = xno; then 165 [if test x$enableval = xyes -o x$enableval = xno; then
166 186
167AC_ARG_ENABLE(transparency, 187AC_ARG_ENABLE(transparency,
168 [ --enable-transparency enable transparent backgrounds], 188 [ --enable-transparency enable transparent backgrounds],
169 [if test x$enableval = xyes -o x$enableval = xno; then 189 [if test x$enableval = xyes -o x$enableval = xno; then
170 support_inheritpixmap=$enableval 190 support_inheritpixmap=$enableval
191 fi])
192
193AC_ARG_ENABLE(tinting,
194 [ --enable-tinting enable tinting of transparent bg],
195 [if test x$enableval = xyes -o x$enableval = xno; then
196 support_tinting=$enableval
197 fi])
198
199AC_ARG_ENABLE(fading,
200 [ --enable-fading enable colors fading when off focus],
201 [if test x$enableval = xyes -o x$enableval = xno; then
202 support_fading=$enableval
171 fi]) 203 fi])
172 204
173AC_ARG_ENABLE(menubar, 205AC_ARG_ENABLE(menubar,
174 [ --enable-menubar enable menubar], 206 [ --enable-menubar enable menubar],
175 [if test x$enableval = xyes -o x$enableval = xno; then 207 [if test x$enableval = xyes -o x$enableval = xno; then
204 [ --enable-half-shadow use half width/height shadow on rxvt scrollbar], 236 [ --enable-half-shadow use half width/height shadow on rxvt scrollbar],
205 [if test x$enableval = xyes; then 237 [if test x$enableval = xyes; then
206 AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less) 238 AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less)
207 fi]) 239 fi])
208 240
241AC_ARG_WITH(codesets,
242 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,cn,cn_ext,all)],
243 [codesets="$withval"])
244
209AC_ARG_ENABLE(xim, 245AC_ARG_ENABLE(xim,
210 [ --enable-xim XIM (X Input Method) protocol support], 246 [ --enable-xim XIM (X Input Method) protocol support],
211 [if test x$enableval = xyes -o x$enableval = xno; then 247 [if test x$enableval = xyes -o x$enableval = xno; then
212 support_xim=$enableval 248 support_xim=$enableval
213 fi]) 249 fi])
240 [ --enable-xgetdefault enable resources via X instead of our small version], 276 [ --enable-xgetdefault enable resources via X instead of our small version],
241 [if test x$enableval = xyes; then 277 [if test x$enableval = xyes; then
242 AC_DEFINE(USE_XGETDEFAULT, 1, Define if you want to use XGetDefault instead of our internal version) 278 AC_DEFINE(USE_XGETDEFAULT, 1, Define if you want to use XGetDefault instead of our internal version)
243 fi]) 279 fi])
244 280
281AC_ARG_ENABLE(8bitctrls,
282 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)],
283 [if test x$enableval = xyes -o x$enableval = xno; then
284 support_8bitctrls=yes
285 fi])
286
287RESFALLBACK=Rxvt
288AC_ARG_ENABLE(fallback,
289 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)],
290 [
291 test x$enableval = xyes && enableval=Rxvt
292 test x$enableval = xno && enableval=
293 RESFALLBACK="$enableval"
294 ])
295
296if test x$RESFALLBACK != x; then
297 AC_DEFINE_UNQUOTED(RESFALLBACK, "$RESFALLBACK", [Fallback resource class])
298fi
299
300RESNAME=urxvt
301AC_ARG_WITH(res-name,
302 [ --with-res-name=NAME use this as default resource name (default: urxvt)],
303 [RESNAME="$withval"])
304AC_DEFINE_UNQUOTED(RESNAME,"$RESNAME", [Default resource name])
305
306RESCLASS=URxvt
307AC_ARG_WITH(res-class,
308 [ --with-res-class=CLASS use this as the resource class (default: URxvt)],
309 [RESCLASS="$withval"])
310AC_DEFINE_UNQUOTED(RESCLASS,"$RESCLASS", [Resource class])
311
312RXVTNAME=urxvt
313AC_ARG_WITH(name,
314 [ --with-name=NAME set the basename for the installed binaries (default: urxvt)],
315 [RXVTNAME="$withval"])
316
317RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"`
318AC_SUBST(RXVTNAME)
319
245AC_ARG_ENABLE(strings, 320AC_ARG_ENABLE(strings,
246 [ --enable-strings enable some replacement system functions], 321 [ --enable-strings enable some replacement system functions],
247 [if test x$enableval = xyes -o x$enableval = xno; then 322 [if test x$enableval = xyes -o x$enableval = xno; then
248 support_addstrings=$enableval 323 support_addstrings=$enableval
249 fi]) 324 fi])
252 [ --disable-swapscreen disable swap screen support], 327 [ --disable-swapscreen disable swap screen support],
253 [if test x$enableval = xno; then 328 [if test x$enableval = xno; then
254 AC_DEFINE(NO_SECONDARY_SCREEN, 1, Disable the secondary screen. Many programs use the secondary screen as their workplace) 329 AC_DEFINE(NO_SECONDARY_SCREEN, 1, Disable the secondary screen. Many programs use the secondary screen as their workplace)
255 fi]) 330 fi])
256 331
332AC_ARG_ENABLE(iso14755,
333 [ --enable-iso14755 enable support for extended ISO 14755 modes],
334 [if test x$enableval = xyes -o x$enableval = xno; then
335 support_iso14755=$enableval
336 fi])
337
257AC_ARG_ENABLE(frills, 338AC_ARG_ENABLE(frills,
258 [ --enable-frills enable support for rarely used features], 339 [ --enable-frills enable support for rarely used features],
259 [if test x$enableval = xyes -o x$enableval = xno; then 340 [if test x$enableval = xyes -o x$enableval = xno; then
260 support_frills=$enableval 341 support_frills=$enableval
261 fi]) 342 fi])
292 373
293AC_ARG_ENABLE(slipwheeling, 374AC_ARG_ENABLE(slipwheeling,
294 [ --enable-slipwheeling enable slip wheel scrolling (requires previous)], 375 [ --enable-slipwheeling enable slip wheel scrolling (requires previous)],
295 [if test x$enableval = xyes -o x$enableval = xno; then 376 [if test x$enableval = xyes -o x$enableval = xno; then
296 support_mouseslipwheel=$enableval 377 support_mouseslipwheel=$enableval
297 fi])
298
299AC_ARG_ENABLE(old-selection,
300 [ --enable-old-selection enable v2.20 (& prior) mouse selection style support],
301 [if test x$enableval = xyes -o x$enableval = xno; then
302 support_oldselection=$enableval
303 fi])
304
305AC_ARG_ENABLE(new-selection,
306 [ --disable-new-selection disable new mouse (xterm) selection style support],
307 [if test x$enableval = xno; then
308 AC_DEFINE(NO_NEW_SELECTION, 1, Define to remove xterm style mouse selection)
309 fi]) 378 fi])
310 379
311AC_ARG_ENABLE(dmalloc, 380AC_ARG_ENABLE(dmalloc,
312 [ --enable-dmalloc enable Gray Watson's malloc - for debugging use], 381 [ --enable-dmalloc enable Gray Watson's malloc - for debugging use],
313 [if test x$enableval = xyes; then 382 [if test x$enableval = xyes; then
331 [ --enable-smart-resize enable smart growth/shrink behaviour], 400 [ --enable-smart-resize enable smart growth/shrink behaviour],
332 [if test x$enableval = xyes; then 401 [if test x$enableval = xyes; then
333 AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior) 402 AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior)
334 fi]) 403 fi])
335 404
336AC_ARG_ENABLE(256-color,
337 [ --enable-256-color enable 256-color support],
338 [if test x$enableval = xyes; then
339 AC_DEFINE(TTY_256COLOR, 1, Define if you want 256 colour support)
340 fi])
341
342AC_ARG_ENABLE(cursor-blink, 405AC_ARG_ENABLE(cursor-blink,
343 [ --enable-cursor-blink enable blinking cursor], 406 [ --enable-cursor-blink enable blinking cursor],
344 [if test x$enableval = xyes -o x$enableval = xno; then 407 [if test x$enableval = xyes -o x$enableval = xno; then
345 support_cursor_blink=$enableval 408 support_cursor_blink=$enableval
346 fi]) 409 fi])
356 [if test x$enableval = xyes -o x$enableval = xno; then 419 [if test x$enableval = xyes -o x$enableval = xno; then
357 support_pointer_blank=$enableval 420 support_pointer_blank=$enableval
358 fi]) 421 fi])
359 422
360AC_ARG_WITH(term, 423AC_ARG_WITH(term,
361 [ --with-term=NAME set the terminal to NAME (default \"xterm\")], 424 [ --with-term=NAME set the terminal to NAME (default: rxvt)],
362 [if test x$withval != x; then 425 [if test x$withval != x; then
363 AC_DEFINE_UNQUOTED(TERMENV, "$withval",Set TERM to the value given by configure) term="$withval" 426 AC_DEFINE_UNQUOTED(TERMENV, "$withval",Set TERM to the value given by configure) term="$withval"
364 fi]) 427 fi])
365 428
366AC_ARG_WITH(terminfo, 429AC_ARG_WITH(terminfo,
440 sys/byteorder.h \ 503 sys/byteorder.h \
441 sys/ioctl.h \ 504 sys/ioctl.h \
442 sys/select.h \ 505 sys/select.h \
443 sys/sockio.h \ 506 sys/sockio.h \
444 sys/strredir.h \ 507 sys/strredir.h \
508 sys/stropts.h \
445 sys/time.h \ 509 sys/time.h \
446 utmp.h \ 510 utmp.h \
447 utmpx.h \ 511 utmpx.h \
448 stdint.h \ 512 stdint.h \
449) 513)
450 514
451AC_HEADER_TIME 515AC_HEADER_TIME
452 516
453dnl# check to allow both <termios.h> and <sys/ioctl.h> 517dnl# check to allow both <termios.h> and <sys/ioctl.h>
454AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl, 518AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
455[AC_TRY_COMPILE([#include <stdio.h> 519[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
456#include <sys/ioctl.h> 520#include <sys/ioctl.h>
457#ifdef HAVE_TERMIOS_H 521#ifdef HAVE_TERMIOS_H
458#include <termios.h> 522#include <termios.h>
459#endif], [int a = ECHO;], rxvt_cv_header_sysioctl=yes, rxvt_cv_header_sysioctl=no)]) 523#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
460 524
461dnl# ELF systems may want to store paths for dynamic libraries. 525dnl# ELF systems may want to store paths for dynamic libraries.
462dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath" 526dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath"
463dnl# At least one version of SunOS wants "-R path" but it's not checked yet. 527dnl# At least one version of SunOS wants "-R path" but it's not checked yet.
464if test -n "$GCC"; then 528if test -n "$GCC"; then
473ac_save_CFLAGS=$CFLAGS 537ac_save_CFLAGS=$CFLAGS
474ac_save_LIBS=$LIBS 538ac_save_LIBS=$LIBS
475CFLAGS="$CFLAGS $X_CFLAGS" 539CFLAGS="$CFLAGS $X_CFLAGS"
476LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` 540LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
477AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath, 541AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath,
478[AC_TRY_RUN([ 542[AC_RUN_IFELSE([AC_LANG_SOURCE([[
479main() 543main()
480{ 544{
481 exit(0); 545 exit(0);
482 (void) XOpenDisplay("foobar"); 546 (void) XOpenDisplay("foobar");
483}], rxvt_cv_rpath=yes, rxvt_cv_rpath=no, dnl 547}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
484 AC_MSG_WARN([You may need to check the LIBS line]))]) 548 AC_MSG_WARN(You may need to check the LIBS line)])])
485if test x$rxvt_cv_rpath != xyes; then 549if test x$rxvt_cv_rpath != xyes; then
486 changequote(, )dnl 550 changequote(, )dnl
487 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g' 551 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
488 changequote([, ])dnl 552 changequote([, ])dnl
489 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` 553 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
490 AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R, 554 AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R,
491[AC_TRY_RUN([ 555[AC_RUN_IFELSE([AC_LANG_SOURCE([[
492main() 556main()
493{ 557{
494 exit(0); 558 exit(0);
495 (void) XOpenDisplay("foobar"); 559 (void) XOpenDisplay("foobar");
496}], rxvt_cv_R=yes, rxvt_cv_R=no, rxvt_cv_R=no)]) 560}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])
497 if test x$rxvt_cv_R != xyes; then 561 if test x$rxvt_cv_R != xyes; then
498 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 562 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
499 fi 563 fi
500fi 564fi
501 565
502AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 566AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
503[AC_TRY_COMPILE([#include <X11/Xlib.h>], [XPointer dummy;], 567[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
504rxvt_cv_xpointer=yes, rxvt_cv_xpointer=no)])
505if test x$rxvt_cv_xpointer = xyes; then 568if test x$rxvt_cv_xpointer = xyes; then
506 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 569 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
507fi 570fi
508LIBS=$ac_save_LIBS 571LIBS=$ac_save_LIBS
509CFLAGS=$ac_save_CFLAGS 572CFLAGS=$ac_save_CFLAGS
522dnl> AC_CHECK_TYPE(umode_t, int) 585dnl> AC_CHECK_TYPE(umode_t, int)
523dnl> AC_CHECK_TYPE(off_t, long) 586dnl> AC_CHECK_TYPE(off_t, long)
524AC_TYPE_PID_T 587AC_TYPE_PID_T
525AC_TYPE_UID_T 588AC_TYPE_UID_T
526 589
527
528AC_CHECK_SIZEOF(char, 1) 590AC_CHECK_SIZEOF(char, 1)
529AC_CHECK_SIZEOF(short, 2) 591AC_CHECK_SIZEOF(short, 2)
530AC_CHECK_SIZEOF(int, 4) 592AC_CHECK_SIZEOF(int, 4)
531AC_CHECK_SIZEOF(long, 4) 593AC_CHECK_SIZEOF(long, 4)
532AC_CHECK_SIZEOF(long long, 8) 594AC_CHECK_SIZEOF(long long, 8)
533AC_CHECK_SIZEOF(int *, 4) 595AC_CHECK_SIZEOF(int *, 4)
534 596
535dnl# see usage below 597dnl# see usage below
536AC_DEFUN(RXVT_CHECK_SIZE, 598AC_DEFUN(RXVT_CHECK_SIZE,
537 [AC_CACHE_CHECK([for $2], $1, 599 [AC_CACHE_CHECK([for $2], $1,
538 [AC_TRY_COMPILE([#include <stdint.h>], $2 dummy;, 600 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl
539 [$1=yes],
540 [dnl
541if test $ac_cv_sizeof_char -ge $3; then 601if test $ac_cv_sizeof_char -ge $3; then
542 $1="$4 char" 602 $1="$4 char"
543else 603else
544 if test $ac_cv_sizeof_short -ge $3; then 604 if test $ac_cv_sizeof_short -ge $3; then
545 $1="$4 short" 605 $1="$4 short"
647dnl# check for host field in utmp structure 707dnl# check for host field in utmp structure
648 708
649dnl# -------------------------------------------- 709dnl# --------------------------------------------
650AC_CHECK_HEADER(utmp.h, 710AC_CHECK_HEADER(utmp.h,
651[AC_CACHE_CHECK([for struct utmp], rxvt_cv_struct_utmp, 711[AC_CACHE_CHECK([for struct utmp], rxvt_cv_struct_utmp,
652[AC_TRY_COMPILE([#include <sys/types.h> 712[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
653#include <stdint.h> 713#include <stdint.h>
654#include <utmp.h>], 714#include <utmp.h>]], [[struct utmp ut;]])],[rxvt_cv_struct_utmp=yes],[rxvt_cv_struct_utmp=no])])
655[struct utmp ut;],
656rxvt_cv_struct_utmp=yes, rxvt_cv_struct_utmp=no)])
657if test x$rxvt_cv_struct_utmp = xyes; then 715if test x$rxvt_cv_struct_utmp = xyes; then
658 AC_DEFINE(HAVE_STRUCT_UTMP, 1, Define if utmp.h has struct utmp) 716 AC_DEFINE(HAVE_STRUCT_UTMP, 1, Define if utmp.h has struct utmp)
659fi 717fi
660] 718]
661 719
662AC_CACHE_CHECK(for ut_host in utmp struct, rxvt_cv_struct_utmp_host, 720AC_CACHE_CHECK(for ut_host in utmp struct, rxvt_cv_struct_utmp_host,
663[AC_TRY_COMPILE([#include <sys/types.h> 721[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
664#include <utmp.h>], 722#include <utmp.h>]], [[struct utmp ut; ut.ut_host;]])],[rxvt_cv_struct_utmp_host=yes],[rxvt_cv_struct_utmp_host=no])])
665[struct utmp ut; ut.ut_host;],
666rxvt_cv_struct_utmp_host=yes, rxvt_cv_struct_utmp_host=no)])
667if test x$rxvt_cv_struct_utmp_host = xyes; then 723if test x$rxvt_cv_struct_utmp_host = xyes; then
668 AC_DEFINE(HAVE_UTMP_HOST, 1, Define if struct utmp contains ut_host) 724 AC_DEFINE(HAVE_UTMP_HOST, 1, Define if struct utmp contains ut_host)
669fi 725fi
670 726
671AC_CACHE_CHECK(for ut_pid in utmp struct, rxvt_cv_struct_utmp_pid, 727AC_CACHE_CHECK(for ut_pid in utmp struct, rxvt_cv_struct_utmp_pid,
672[AC_TRY_COMPILE([#include <sys/types.h> 728[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
673#include <utmp.h>], 729#include <utmp.h>]], [[struct utmp ut; ut.ut_pid;]])],[rxvt_cv_struct_utmp_pid=yes],[rxvt_cv_struct_utmp_pid=no])])
674[struct utmp ut; ut.ut_pid;],
675rxvt_cv_struct_utmp_pid=yes, rxvt_cv_struct_utmp_pid=no)])
676if test x$rxvt_cv_struct_utmp_pid = xyes; then 730if test x$rxvt_cv_struct_utmp_pid = xyes; then
677 AC_DEFINE(HAVE_UTMP_PID, 1, Define if struct utmp contains ut_pid) 731 AC_DEFINE(HAVE_UTMP_PID, 1, Define if struct utmp contains ut_pid)
678fi 732fi
679) dnl# AC_CHECK_HEADER(utmp.h 733) dnl# AC_CHECK_HEADER(utmp.h
680 734
681dnl# -------------------------------------------- 735dnl# --------------------------------------------
682 736
683AC_CHECK_HEADER(utmpx.h, 737AC_CHECK_HEADER(utmpx.h,
684[AC_CACHE_CHECK([for struct utmpx], rxvt_cv_struct_utmpx, 738[AC_CACHE_CHECK([for struct utmpx], rxvt_cv_struct_utmpx,
685[AC_TRY_COMPILE([#include <sys/types.h> 739[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
686#include <utmpx.h>], 740#include <utmpx.h>]], [[struct utmpx ut;]])],[rxvt_cv_struct_utmpx=yes],[rxvt_cv_struct_utmpx=no])])
687[struct utmpx ut;],
688rxvt_cv_struct_utmpx=yes, rxvt_cv_struct_utmpx=no)])
689if test x$rxvt_cv_struct_utmpx = xyes; then 741if test x$rxvt_cv_struct_utmpx = xyes; then
690 AC_DEFINE(HAVE_STRUCT_UTMPX, 1, Define if utmpx.h has struct utmpx) 742 AC_DEFINE(HAVE_STRUCT_UTMPX, 1, Define if utmpx.h has struct utmpx)
691fi 743fi
692] 744]
693 745
694AC_CACHE_CHECK(for host in utmpx struct, rxvt_cv_struct_utmpx_host, 746AC_CACHE_CHECK(for host in utmpx struct, rxvt_cv_struct_utmpx_host,
695[AC_TRY_COMPILE([#include <sys/types.h> 747[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
696#include <utmpx.h>], 748#include <utmpx.h>]], [[struct utmpx utx; utx.ut_host;]])],[rxvt_cv_struct_utmpx_host=yes],[rxvt_cv_struct_utmpx_host=no])])
697[struct utmpx utx; utx.ut_host;],
698rxvt_cv_struct_utmpx_host=yes, rxvt_cv_struct_utmpx_host=no)])
699if test x$rxvt_cv_struct_utmpx_host = xyes; then 749if test x$rxvt_cv_struct_utmpx_host = xyes; then
700 AC_DEFINE(HAVE_UTMPX_HOST, 1, Define if struct utmpx contains ut_host) 750 AC_DEFINE(HAVE_UTMPX_HOST, 1, Define if struct utmpx contains ut_host)
701fi 751fi
702) dnl# AC_CHECK_HEADER(utmpx.h 752) dnl# AC_CHECK_HEADER(utmpx.h
703 753
704 754
705dnl# -------------------------------------------------------------------------- 755dnl# --------------------------------------------------------------------------
706dnl# check for struct lastlog 756dnl# check for struct lastlog
707AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog, 757AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog,
708[AC_TRY_COMPILE([#include <sys/types.h> 758[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
709#include <utmp.h> 759#include <utmp.h>
710#ifdef HAVE_LASTLOG_H 760#ifdef HAVE_LASTLOG_H
711#include <lastlog.h> 761#include <lastlog.h>
712#endif 762#endif
713],
714[struct lastlog ll;],
715rxvt_cv_struct_lastlog=yes, rxvt_cv_struct_lastlog=no)]) 763]], [[struct lastlog ll;]])],[rxvt_cv_struct_lastlog=yes],[rxvt_cv_struct_lastlog=no])])
716if test x$rxvt_cv_struct_lastlog = xyes; then 764if test x$rxvt_cv_struct_lastlog = xyes; then
717 AC_DEFINE(HAVE_STRUCT_LASTLOG, 1, Define if utmp.h or lastlog.h has struct lastlog) 765 AC_DEFINE(HAVE_STRUCT_LASTLOG, 1, Define if utmp.h or lastlog.h has struct lastlog)
718fi 766fi
719 767
720dnl# check for struct lastlogx 768dnl# check for struct lastlogx
721AC_CACHE_CHECK(for struct lastlogx, rxvt_cv_struct_lastlogx, 769AC_CACHE_CHECK(for struct lastlogx, rxvt_cv_struct_lastlogx,
722[AC_TRY_COMPILE([#include <sys/types.h> 770[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
723#include <utmpx.h> 771#include <utmpx.h>
724#ifdef HAVE_LASTLOG_H 772#ifdef HAVE_LASTLOG_H
725#include <lastlog.h> 773#include <lastlog.h>
726#endif 774#endif
727],
728[struct lastlogx ll;],
729rxvt_cv_struct_lastlogx=yes, rxvt_cv_struct_lastlogx=no)]) 775]], [[struct lastlogx ll;]])],[rxvt_cv_struct_lastlogx=yes],[rxvt_cv_struct_lastlogx=no])])
730if test x$rxvt_cv_struct_lastlogx = xyes; then 776if test x$rxvt_cv_struct_lastlogx = xyes; then
731 AC_DEFINE(HAVE_STRUCT_LASTLOGX, 1, Define if utmpx.h or lastlog.h has struct lastlogx) 777 AC_DEFINE(HAVE_STRUCT_LASTLOGX, 1, Define if utmpx.h or lastlog.h has struct lastlogx)
732fi 778fi
733 779
734dnl# -------------------------------------------------------------------------- 780dnl# --------------------------------------------------------------------------
735dnl# FIND FILES 781dnl# FIND FILES
736dnl# -------------------------------------------------------------------------- 782dnl# --------------------------------------------------------------------------
737 783
738dnl# find utmp 784dnl# find utmp
739AC_CACHE_CHECK(where utmp is located, rxvt_cv_path_utmp, 785AC_CACHE_CHECK(where utmp is located, rxvt_cv_path_utmp,
740[AC_TRY_RUN([#include <stdio.h> 786[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
741#include <sys/types.h> 787#include <sys/types.h>
742#include <utmp.h> 788#include <utmp.h>
743#include <errno.h> 789#include <errno.h>
744main() 790main()
745{ 791{
760 fprintf(f, "%s\n", *u); 806 fprintf(f, "%s\n", *u);
761 exit(0); 807 exit(0);
762 } 808 }
763 } 809 }
764 exit(0); 810 exit(0);
765}], rxvt_cv_path_utmp=`cat conftestval`, rxvt_cv_path_utmp=, dnl 811}]])],[rxvt_cv_path_utmp=`cat conftestval`],[rxvt_cv_path_utmp=],[dnl
766 AC_MSG_WARN([Define RXVT_UTMP_FILE in config.h manually]))]) 812 AC_MSG_WARN(Define RXVT_UTMP_FILE in config.h manually)])])
767if test x$rxvt_cv_path_utmp != x; then 813if test x$rxvt_cv_path_utmp != x; then
768 AC_DEFINE_UNQUOTED(RXVT_UTMP_FILE, "$rxvt_cv_path_utmp", Define location of utmp) 814 AC_DEFINE_UNQUOTED(RXVT_UTMP_FILE, "$rxvt_cv_path_utmp", Define location of utmp)
769fi 815fi
770 816
771dnl# -------------------------------------------------------------------------- 817dnl# --------------------------------------------------------------------------
772 818
773dnl# find utmpx - if a utmp file exists at the same location and is more than 819dnl# find utmpx - if a utmp file exists at the same location and is more than
774dnl# a day newer, then dump the utmpx. People leave lots of junk around. 820dnl# a day newer, then dump the utmpx. People leave lots of junk around.
775AC_CACHE_CHECK(where utmpx is located, rxvt_cv_path_utmpx, 821AC_CACHE_CHECK(where utmpx is located, rxvt_cv_path_utmpx,
776[AC_TRY_RUN([#include <stdio.h> 822[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
777#include <sys/types.h> 823#include <sys/types.h>
778#include <utmpx.h> 824#include <utmpx.h>
779#include <errno.h> 825#include <errno.h>
780#include <sys/stat.h> 826#include <sys/stat.h>
781#ifdef HAVE_STRING_H 827#ifdef HAVE_STRING_H
806 fprintf(f, "%s\n", *u); 852 fprintf(f, "%s\n", *u);
807 exit(0); 853 exit(0);
808 } 854 }
809 } 855 }
810 exit(0); 856 exit(0);
811}], rxvt_cv_path_utmpx=`cat conftestval`, rxvt_cv_path_utmpx=, dnl 857}]])],[rxvt_cv_path_utmpx=`cat conftestval`],[rxvt_cv_path_utmpx=],[dnl
812 AC_MSG_WARN([Define RXVT_UTMPX_FILE in config.h manually]))]) 858 AC_MSG_WARN(Define RXVT_UTMPX_FILE in config.h manually)])])
813if test x$rxvt_cv_path_utmpx != x; then 859if test x$rxvt_cv_path_utmpx != x; then
814 AC_DEFINE_UNQUOTED(RXVT_UTMPX_FILE, "$rxvt_cv_path_utmpx", Define location of utmpx) 860 AC_DEFINE_UNQUOTED(RXVT_UTMPX_FILE, "$rxvt_cv_path_utmpx", Define location of utmpx)
815fi 861fi
816 862
817dnl# -------------------------------------------------------------------------- 863dnl# --------------------------------------------------------------------------
818 864
819dnl# find wtmp 865dnl# find wtmp
820AC_CACHE_CHECK(where wtmp is located, rxvt_cv_path_wtmp, 866AC_CACHE_CHECK(where wtmp is located, rxvt_cv_path_wtmp,
821[AC_TRY_RUN([#include <stdio.h> 867[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
822#include <sys/types.h> 868#include <sys/types.h>
823#ifdef HAVE_UTMP_H 869#ifdef HAVE_UTMP_H
824#include <utmp.h> 870#include <utmp.h>
825#endif 871#endif
826#include <errno.h> 872#include <errno.h>
843 fprintf(f, "%s\n", *w); 889 fprintf(f, "%s\n", *w);
844 exit(0); 890 exit(0);
845 } 891 }
846 } 892 }
847 exit(0); 893 exit(0);
848}], rxvt_cv_path_wtmp=`cat conftestval`, rxvt_cv_path_wtmp=, dnl 894}]])],[rxvt_cv_path_wtmp=`cat conftestval`],[rxvt_cv_path_wtmp=],[dnl
849 AC_MSG_WARN([Define RXVT_WTMP_FILE in config.h manually]))]) 895 AC_MSG_WARN(Define RXVT_WTMP_FILE in config.h manually)])])
850if test x$rxvt_cv_path_wtmp != x; then 896if test x$rxvt_cv_path_wtmp != x; then
851 AC_DEFINE_UNQUOTED(RXVT_WTMP_FILE, "$rxvt_cv_path_wtmp", Define location of wtmp) 897 AC_DEFINE_UNQUOTED(RXVT_WTMP_FILE, "$rxvt_cv_path_wtmp", Define location of wtmp)
852fi 898fi
853dnl# -------------------------------------------------------------------------- 899dnl# --------------------------------------------------------------------------
854 900
855dnl# find wtmpx 901dnl# find wtmpx
856AC_CACHE_CHECK(where wtmpx is located, rxvt_cv_path_wtmpx, 902AC_CACHE_CHECK(where wtmpx is located, rxvt_cv_path_wtmpx,
857[AC_TRY_RUN([#include <stdio.h> 903[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
858#ifdef HAVE_UTMPX_H 904#ifdef HAVE_UTMPX_H
859#include <utmpx.h> 905#include <utmpx.h>
860#endif 906#endif
861#include <errno.h> 907#include <errno.h>
862main() 908main()
878 fprintf(f, "%s\n", *w); 924 fprintf(f, "%s\n", *w);
879 exit(0); 925 exit(0);
880 } 926 }
881 } 927 }
882 exit(0); 928 exit(0);
883}], rxvt_cv_path_wtmpx=`cat conftestval`, rxvt_cv_path_wtmpx=, dnl 929}]])],[rxvt_cv_path_wtmpx=`cat conftestval`],[rxvt_cv_path_wtmpx=],[dnl
884 AC_MSG_WARN([Define RXVT_WTMPX_FILE in config.h manually]))]) 930 AC_MSG_WARN(Define RXVT_WTMPX_FILE in config.h manually)])])
885if test x$rxvt_cv_path_wtmpx != x; then 931if test x$rxvt_cv_path_wtmpx != x; then
886 AC_DEFINE_UNQUOTED(RXVT_WTMPX_FILE, "$rxvt_cv_path_wtmpx", Define location of wtmpx) 932 AC_DEFINE_UNQUOTED(RXVT_WTMPX_FILE, "$rxvt_cv_path_wtmpx", Define location of wtmpx)
887fi 933fi
888dnl# -------------------------------------------------------------------------- 934dnl# --------------------------------------------------------------------------
889 935
890dnl# find lastlog 936dnl# find lastlog
891AC_CACHE_CHECK(where lastlog is located, rxvt_cv_path_lastlog, 937AC_CACHE_CHECK(where lastlog is located, rxvt_cv_path_lastlog,
892[AC_TRY_RUN([#include <stdio.h> 938[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
893#include <sys/types.h> 939#include <sys/types.h>
894#ifdef HAVE_UTMPX_H 940#ifdef HAVE_UTMPX_H
895#include <utmpx.h> 941#include <utmpx.h>
896#elif defined(HAVE_UTMP_H) 942#elif defined(HAVE_UTMP_H)
897#include <utmp.h> 943#include <utmp.h>
918 fprintf(f, "%s\n", *w); 964 fprintf(f, "%s\n", *w);
919 exit(0); 965 exit(0);
920 } 966 }
921 } 967 }
922 exit(0); 968 exit(0);
923}], rxvt_cv_path_lastlog=`cat conftestval`, rxvt_cv_path_lastlog=, dnl 969}]])],[rxvt_cv_path_lastlog=`cat conftestval`],[rxvt_cv_path_lastlog=],[dnl
924 AC_MSG_WARN([Define RXVT_LASTLOG_FILE in config.h manually]))]) 970 AC_MSG_WARN(Define RXVT_LASTLOG_FILE in config.h manually)])])
925if test x$rxvt_cv_path_lastlog != x; then 971if test x$rxvt_cv_path_lastlog != x; then
926 AC_DEFINE_UNQUOTED(RXVT_LASTLOG_FILE, "$rxvt_cv_path_lastlog", Define location of lastlog) 972 AC_DEFINE_UNQUOTED(RXVT_LASTLOG_FILE, "$rxvt_cv_path_lastlog", Define location of lastlog)
927 if test -d "$rxvt_cv_path_lastlog"; then 973 if test -d "$rxvt_cv_path_lastlog"; then
928 AC_DEFINE(LASTLOG_IS_DIR, 1, Define if lastlog is provided via a directory) 974 AC_DEFINE(LASTLOG_IS_DIR, 1, Define if lastlog is provided via a directory)
929 fi 975 fi
930fi 976fi
931dnl# -------------------------------------------------------------------------- 977dnl# --------------------------------------------------------------------------
932 978
933dnl# find lastlogx 979dnl# find lastlogx
934AC_CACHE_CHECK(where lastlogx is located, rxvt_cv_path_lastlogx, 980AC_CACHE_CHECK(where lastlogx is located, rxvt_cv_path_lastlogx,
935[AC_TRY_RUN([#include <stdio.h> 981[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
936#ifdef HAVE_UTMPX_H 982#ifdef HAVE_UTMPX_H
937#include <utmpx.h> 983#include <utmpx.h>
938#endif 984#endif
939#include <errno.h> 985#include <errno.h>
940main() 986main()
955 fprintf(f, "%s\n", *w); 1001 fprintf(f, "%s\n", *w);
956 exit(0); 1002 exit(0);
957 } 1003 }
958 } 1004 }
959 exit(0); 1005 exit(0);
960}], rxvt_cv_path_lastlogx=`cat conftestval`, rxvt_cv_path_lastlogx=, dnl 1006}]])],[rxvt_cv_path_lastlogx=`cat conftestval`],[rxvt_cv_path_lastlogx=],[dnl
961 AC_MSG_WARN([Define RXVT_LASTLOGX_FILE in config.h manually]))]) 1007 AC_MSG_WARN(Define RXVT_LASTLOGX_FILE in config.h manually)])])
962if test x$rxvt_cv_path_lastlogx != x; then 1008if test x$rxvt_cv_path_lastlogx != x; then
963 AC_DEFINE_UNQUOTED(RXVT_LASTLOGX_FILE, "$rxvt_cv_path_lastlogx", Define location of lastlogx) 1009 AC_DEFINE_UNQUOTED(RXVT_LASTLOGX_FILE, "$rxvt_cv_path_lastlogx", Define location of lastlogx)
964fi 1010fi
965 1011
966dnl# -------------------------------------------------------------------------- 1012dnl# --------------------------------------------------------------------------
990LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 1036LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
991if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then 1037if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
992 LIBS=`echo $LIBS | sed "$R_TRANSLATE"` 1038 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
993fi 1039fi
994AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 1040AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
995[AC_TRY_RUN([#include <X11/Xlib.h> 1041[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
996main() { 1042main() {
997char *p; 1043char *p;
998if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 1044if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
999exit (XSupportsLocale() ? 0 : 1); 1045exit (XSupportsLocale() ? 0 : 1);
1000else 1046else
1001exit (1);}], dnl 1047exit (1);}]])],[dnl
1002 rxvt_cv_func_xlocale=yes, rxvt_cv_func_xlocale=no, dnl 1048 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
1003 AC_MSG_WARN([Define NO_XLOCALE in config.h manually]))]) 1049 AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])])
1004if test x$rxvt_cv_func_xlocale = xyes; then 1050if test x$rxvt_cv_func_xlocale = xyes; then
1005 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works) 1051 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works)
1006fi 1052fi
1007 1053
1008AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, 1054AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
1009[AC_TRY_LINK([#define X_LOCALE 1 1055[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
1010#include <X11/Xlocale.h>], 1056#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
1011 [setlocale(LC_CTYPE, "");],
1012 rxvt_cv_func_xsetlocale=yes, rxvt_cv_func_xsetlocale=no)])
1013if test x$rxvt_cv_func_xsetlocale = xyes; then 1057if test x$rxvt_cv_func_xsetlocale = xyes; then
1014 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 1058 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
1015fi 1059fi
1016LIBS=$ac_save_LIBS 1060LIBS=$ac_save_LIBS
1017CFLAGS=$ac_save_CFLAGS 1061CFLAGS=$ac_save_CFLAGS
1018 1062
1019AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale, 1063AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
1020[AC_TRY_LINK([#include <locale.h>], 1064[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])
1021 [setlocale(LC_CTYPE, "");],
1022 rxvt_cv_func_setlocale=yes, rxvt_cv_func_setlocale=no)])
1023if test x$rxvt_cv_func_setlocale = xyes; then 1065if test x$rxvt_cv_func_setlocale = xyes; then
1024 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works) 1066 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
1025fi 1067fi
1026 1068
1027AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo, 1069AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,
1028[AC_TRY_LINK([#include <langinfo.h>], 1070[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])])
1029 [nl_langinfo(CODESET);],
1030 rxvt_cv_func_nl_langinfo=yes, rxvt_cv_func_nl_langinfo=no)])
1031if test x$rxvt_cv_func_nl_langinfo = xyes; then 1071if test x$rxvt_cv_func_nl_langinfo = xyes; then
1032 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) 1072 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
1033fi 1073fi
1034 1074
1075AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
1076[AC_COMPILE_IFELSE([
1077#include <X11/Xlib.h>
1078
1079void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
1080
1081void f() {
1082 XIMCallback cb;
1083 cb.callback = im_destroy_cb;
1084}
1085],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)])
1086
1087if test x$rxvt_broken_ximcb = xyes; then
1088 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
1089fi
1090
1035AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt, 1091AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt,
1036[AC_TRY_LINK([#define _GNU_SOURCE 1092[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define _GNU_SOURCE
1037#ifdef HAVE_STDLIB_H 1093#ifdef HAVE_STDLIB_H
1038# include <stdlib.h> 1094# include <cstdlib>
1039#endif], 1095#endif]], [[(void)getpt();]])],[rxvt_cv_func_getpt=yes],[rxvt_cv_func_getpt=no])])
1040 [(void)getpt();],
1041 rxvt_cv_func_getpt=yes, rxvt_cv_func_getpt=no)])
1042if test x$rxvt_cv_func_getpt = xyes; then 1096if test x$rxvt_cv_func_getpt = xyes; then
1043 AC_DEFINE(HAVE_GETPT, 1, Define if you have _GNU_SOURCE getpt() ) 1097 AC_DEFINE(HAVE_GETPT, 1, Define if you have _GNU_SOURCE getpt() )
1044fi 1098fi
1045 1099
1046dnl# if we don't guess right then it's up to the user 1100dnl# if we don't guess right then it's up to the user
1104if test x$rxvt_cv_ptys = xBSD -o x$rxvt_cv_ptys = xHPUX -o x$rxvt_cv_ptys = xGLIBC; then 1158if test x$rxvt_cv_ptys = xBSD -o x$rxvt_cv_ptys = xHPUX -o x$rxvt_cv_ptys = xGLIBC; then
1105 AC_DEFINE(PTYS_ARE_SEARCHED, 1, Define for this pty type) 1159 AC_DEFINE(PTYS_ARE_SEARCHED, 1, Define for this pty type)
1106fi 1160fi
1107 1161
1108 1162
1109AC_CHECKING(for pty ranges) 1163AS_MESSAGE(checking for pty ranges...)
1110ptys=`echo /dev/pty??` 1164ptys=`echo /dev/pty??`
1111pch1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'` 1165pch1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'`
1112pch2=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'` 1166pch2=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'`
1113if test x$pch1 != x; then 1167if test x$pch1 != x; then
1114 AC_DEFINE_UNQUOTED(PTYCHAR1, "$pch1", Define for first char in devptyXX) 1168 AC_DEFINE_UNQUOTED(PTYCHAR1, "$pch1", Define for first char in devptyXX)
1115fi 1169fi
1116if test x$pch2 != x; then 1170if test x$pch2 != x; then
1117 AC_DEFINE_UNQUOTED(PTYCHAR2, "$pch2", Define for second char in devptyXX) 1171 AC_DEFINE_UNQUOTED(PTYCHAR2, "$pch2", Define for second char in devptyXX)
1118fi 1172fi
1119 1173
1120dnl# FreeBSD needs to link libxpg4
1121AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])
1122
1123dnl# -------------------------------------------------------------------------- 1174dnl# --------------------------------------------------------------------------
1124dnl# now add and remove other stuff 1175dnl# now add and remove other stuff
1125dnl# -------------------------------------------------------------------------- 1176dnl# --------------------------------------------------------------------------
1177if test x$support_iso14755 = xyes; then
1178 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
1179fi
1180if test x$support_8bitctrls = xyes; then
1181 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
1182fi
1183if test x$support_fading = xyes; then
1184 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
1185fi
1186if test x$support_tinting = xyes; then
1187 AC_DEFINE(TINTING, 1, Define if you want your background to be tinted)
1188fi
1126if test x$support_inheritpixmap = xyes; then 1189if test x$support_inheritpixmap = xyes; then
1127 AC_DEFINE(TRANSPARENT, 1, Define if you want your background to use the parent window background) 1190 AC_DEFINE(TRANSPARENT, 1, Define if you want your background to use the parent window background)
1128fi 1191fi
1129if test x$support_keepscrolling = xno; then 1192if test x$support_keepscrolling = xno; then
1130 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) 1193 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
1133 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen) 1196 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)
1134fi 1197fi
1135if test x$support_menubar = xyes; then 1198if test x$support_menubar = xyes; then
1136 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support) 1199 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support)
1137fi 1200fi
1138if test x$support_frills = xno; then 1201if test x$support_frills = xyes; then
1139 AC_DEFINE(NO_FRILLS, 1, Define if you don't want handling for rarely used features) 1202 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
1140fi 1203fi
1141if test x$support_linespace = xno; then 1204if test x$support_linespace = xno; then
1142 AC_DEFINE(NO_LINESPACE, 1, Define if you don't want support linespace) 1205 AC_DEFINE(NO_LINESPACE, 1, Define if you don't want support linespace)
1143fi 1206fi
1144if test x$support_24bit = xyes; then 1207if test x$support_24bit = xyes; then
1147if test x$support_mousewheel = xyes; then 1210if test x$support_mousewheel = xyes; then
1148 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) 1211 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
1149fi 1212fi
1150if test x$support_mouseslipwheel = xyes; then 1213if test x$support_mouseslipwheel = xyes; then
1151 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling) 1214 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
1152fi
1153if test x$support_oldselection = xno; then
1154 AC_DEFINE(NO_OLD_SELECTION, 1, Define to remove old rxvt (ver 2.20 and before) style selection)
1155fi 1215fi
1156if test x$support_utmp = xyes; then 1216if test x$support_utmp = xyes; then
1157 AC_DEFINE(UTMP_SUPPORT, 1, Define if you want to have utmp/utmpx support) 1217 AC_DEFINE(UTMP_SUPPORT, 1, Define if you want to have utmp/utmpx support)
1158fi 1218fi
1159if test x$support_wtmp = xyes; then 1219if test x$support_wtmp = xyes; then
1196 AC_DEFINE(TEXT_BLINK, 1, Define if you want blinking text support) 1256 AC_DEFINE(TEXT_BLINK, 1, Define if you want blinking text support)
1197fi 1257fi
1198if test x$support_unicode3 = xyes; then 1258if test x$support_unicode3 = xyes; then
1199 AC_DEFINE(UNICODE_3, 1, Define if you want to represent unicode characters outside plane 0) 1259 AC_DEFINE(UNICODE_3, 1, Define if you want to represent unicode characters outside plane 0)
1200fi 1260fi
1261if test x$support_combining = xyes; then
1262 AC_DEFINE(ENABLE_COMBINING, 1, Define if you want to automatically compose combining characters)
1263fi
1201if test x$codesets = xall; then 1264if test x$codesets = xall; then
1202 codesets=jp,jp-ext,kr,cn,cn-ext,vn 1265 codesets=jp,jp-ext,kr,cn,cn-ext
1203fi 1266fi
1267AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
1268AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
1204for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do 1269for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do
1205 AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
1206 case "$codeset" in 1270 case "$codeset" in
1207 VN ) AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets) ;;
1208 JP ) AC_DEFINE(ENCODING_JP, 1, Define if you want japanese codesets) ;; 1271 JP ) AC_DEFINE(ENCODING_JP, 1, Define if you want japanese codesets) ;;
1209 JP_EXT ) AC_DEFINE(ENCODING_JP_EXT, 1, Define if you want extended japanese codesets) ;; 1272 JP_EXT ) AC_DEFINE(ENCODING_JP_EXT, 1, Define if you want extended japanese codesets) ;;
1210 KR ) AC_DEFINE(ENCODING_KR, 1, Define if you want korean codesets) ;; 1273 KR ) AC_DEFINE(ENCODING_KR, 1, Define if you want korean codesets) ;;
1211 CN ) AC_DEFINE(ENCODING_CN, 1, Define if you want chinese codesets) ;; 1274 CN ) AC_DEFINE(ENCODING_CN, 1, Define if you want chinese codesets) ;;
1212 CN_EXT ) AC_DEFINE(ENCODING_CN_EXT, 1, Define if you want extended chinese codesets) ;; 1275 CN_EXT ) AC_DEFINE(ENCODING_CN_EXT, 1, Define if you want extended chinese codesets) ;;
1246dnl# common parts of the Makefile 1309dnl# common parts of the Makefile
1247MCOMMON=./autoconf/Make.common 1310MCOMMON=./autoconf/Make.common
1248AC_SUBST_FILE(MCOMMON) 1311AC_SUBST_FILE(MCOMMON)
1249 1312
1250AC_ARG_PROGRAM 1313AC_ARG_PROGRAM
1251
1252RXVTNAME=`echo rxvt|sed "$program_transform_name"`
1253AC_SUBST(RXVTNAME)
1254 1314
1255dnl# test for "sun" or "__sun__" before include sys_ioctl 1315dnl# test for "sun" or "__sun__" before include sys_ioctl
1256 1316
1257dnl# revert HAVE_BLAH_H into a "#include <blah.h>" 1317dnl# revert HAVE_BLAH_H into a "#include <blah.h>"
1258AC_DEFUN(RXVT_DEFINE_TO_INCLUDE, dnl 1318AC_DEFUN(RXVT_DEFINE_TO_INCLUDE, dnl
1262 $1="/* #include <$2> */" 1322 $1="/* #include <$2> */"
1263fi dnl 1323fi dnl
1264AC_SUBST($1)]) 1324AC_SUBST($1)])
1265 1325
1266RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch) 1326RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch)
1267RXVT_DEFINE_TO_INCLUDE(include_stdarg_h, stdarg.h, ac_cv_header_stdarg_h, yes, notset, dontmatch) 1327RXVT_DEFINE_TO_INCLUDE(include_stdarg_h, cstdarg, ac_cv_header_stdarg_h, yes, notset, dontmatch)
1268RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, stdlib.h, ac_cv_header_stdlib_h, yes, notset, dontmatch) 1328RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, cstdlib, ac_cv_header_stdlib_h, yes, notset, dontmatch)
1269RXVT_DEFINE_TO_INCLUDE(include_unistd_h, unistd.h, ac_cv_header_unistd_h, yes, notset, dontmatch) 1329RXVT_DEFINE_TO_INCLUDE(include_unistd_h, unistd.h, ac_cv_header_unistd_h, yes, notset, dontmatch)
1270RXVT_DEFINE_TO_INCLUDE(include_string_h, string.h, ac_cv_header_string_h, yes, notset, dontmatch) 1330RXVT_DEFINE_TO_INCLUDE(include_string_h, cstring, ac_cv_header_string_h, yes, notset, dontmatch)
1271RXVT_DEFINE_TO_INCLUDE(include_fcntl_h, fcntl.h, ac_cv_header_fcntl_h, yes, notset, dontmatch) 1331RXVT_DEFINE_TO_INCLUDE(include_fcntl_h, fcntl.h, ac_cv_header_fcntl_h, yes, notset, dontmatch)
1272RXVT_DEFINE_TO_INCLUDE(include_util_h, util.h, ac_cv_header_util_h, yes, notset, dontmatch) 1332RXVT_DEFINE_TO_INCLUDE(include_util_h, util.h, ac_cv_header_util_h, yes, notset, dontmatch)
1273RXVT_DEFINE_TO_INCLUDE(include_assert_h, assert.h, ac_cv_header_assert_h, yes, notset, dontmatch) 1333RXVT_DEFINE_TO_INCLUDE(include_assert_h, assert.h, ac_cv_header_assert_h, yes, notset, dontmatch)
1274RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch) 1334RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch)
1275RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch) 1335RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch)
1288 if test x$support_xft = xyes; then 1348 if test x$support_xft = xyes; then
1289 AC_DEFINE(XFT, 1, Define to enable xft support) 1349 AC_DEFINE(XFT, 1, Define to enable xft support)
1290 fi 1350 fi
1291fi 1351fi
1292 1352
1293AC_OUTPUT(autoconf/Make.common \ 1353AC_CONFIG_FILES([autoconf/Make.common \
1294Makefile \ 1354Makefile \
1295doc/Makefile \ 1355doc/Makefile \
1296src/Makefile \ 1356src/Makefile \
1297src/test/Makefile \ 1357src/test/Makefile \
1298src/rxvtlib.h \ 1358src/rxvtlib.h \
1299W11/Makefile \ 1359W11/Makefile \
1300) 1360])
1361AC_OUTPUT
1301 1362
1302echo "Configuration: 1363echo "Configuration:
1303 1364
1304 Rxvt version: $VERSION : $DATE 1365 Rxvt version: $VERSION : $DATE
1305 Source code location: $srcdir 1366 Source code location: $srcdir
1306 Install path: ${prefix}/bin 1367 Install path: ${prefix}/bin
1307 Compiler: $CC 1368 Compiler: $CXX
1308 Compiler flags: $CFLAGS" 1369 Compiler flags: $CFLAGS
1370 Linker: $LINKER"
1309 1371
1310if test "$MALLOC_TYPE" = S; then 1372if test "$MALLOC_TYPE" = S; then
1311 echo " malloc support: system default" 1373 echo " malloc support: system default"
1312fi 1374fi
1313if test "$MALLOC_TYPE" = G; then 1375if test "$MALLOC_TYPE" = G; then
1324echo " 1386echo "
1325The following are set in config.h 1387The following are set in config.h
1326" 1388"
1327echo " pty/tty type: "$rxvt_cv_ptys 1389echo " pty/tty type: "$rxvt_cv_ptys
1328if test x$support_utmp != xyes; then 1390if test x$support_utmp != xyes; then
1329 echo " utmp support: disabled 1391 echo " utmp support: disabled"
1330" 1392 echo
1331else 1393else
1332 echo " utmp support: enabled 1394 echo " utmp support: enabled
1333 utmp file: $rxvt_cv_path_utmp 1395 utmp file: $rxvt_cv_path_utmp
1334 utmpx file: $rxvt_cv_path_utmpx 1396 utmpx file: $rxvt_cv_path_utmpx
1335 wtmp file: $rxvt_cv_path_wtmp 1397 wtmp file: $rxvt_cv_path_wtmp
1336 wtmpx file: $rxvt_cv_path_wtmpx 1398 wtmpx file: $rxvt_cv_path_wtmpx
1337 lastlog file: $rxvt_cv_path_lastlog 1399 lastlog file: $rxvt_cv_path_lastlog
1338 ttys/ttytab file: $rxvt_cv_path_ttytab 1400 ttys/ttytab file: $rxvt_cv_path_ttytab"
1339" 1401 echo
1340fi 1402fi
1341if test x$term != x; then 1403if test x$term != x; then
1342 echo " set TERM to: $term 1404 echo " set TERM to: $term"
1343"
1344fi 1405fi
1345if test x$terminfo != x; then 1406if test x$terminfo != x; then
1346 echo " set TERMINFO to: $terminfo 1407 echo " set TERMINFO to: $terminfo"
1347"
1348fi 1408fi
1409echo " default resource name: $RESNAME"
1410echo " resource class: $RESCLASS"
1411if test x$RESFALLBACK != x; then
1412 echo " resource class fallback: $RESFALLBACK"
1413fi
1414echo
1349if test x$rxvt_cv_ptys = xUNKNOWN; then 1415if test x$rxvt_cv_ptys = xUNKNOWN; then
1350 echo ".----------------------------------------------------------------." 1416 echo ".----------------------------------------------------------------."
1351 echo ". WARNING: could not determine pty/tty type. Do not build until ." 1417 echo ". WARNING: could not determine pty/tty type. Do not build until ."
1352 echo ". the appropriate PTYS_ARE_* is defined in config.h ." 1418 echo ". the appropriate PTYS_ARE_* is defined in config.h ."
1353 echo ".----------------------------------------------------------------." 1419 echo ".----------------------------------------------------------------."
1367 echo ". WARNING: --enable-xim was specified however the locale support ." 1433 echo ". WARNING: --enable-xim was specified however the locale support ."
1368 echo ". functions could not be found. ." 1434 echo ". functions could not be found. ."
1369 echo ". XIM is now being DISABLED! ." 1435 echo ". XIM is now being DISABLED! ."
1370 echo ".----------------------------------------------------------------." 1436 echo ".----------------------------------------------------------------."
1371fi 1437fi
1438
1372echo " *** Please check src/feature.h for further options *** 1439echo " *** Please check src/feature.h for further options ***"
1373" 1440echo
1441
1442echo ".----------------------------------------------------------------."
1443echo ". NOTE: most features are disabled by default, try ."
1444echo ". configure --help to get an idea of the optional features ."
1445echo ".----------------------------------------------------------------."
1446echo
1447

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines