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.29 by root, Fri Jul 30 15:06:49 2004 UTC vs.
Revision 1.49 by root, Sun Feb 13 08:56:27 2005 UTC

1dnl# -*- sh -*- 1dnl# -*- sh -*-
2dnl# 2dnl#
3dnl# Process this file with autoconf to produce a configure script. 3dnl# Process this file with autoconf to produce a configure script.
4dnl# 4dnl#
5AC_INIT(src/feature.h) 5orig_CXXFLAGS="$CXXFLAGS"
6
7AC_INIT
8AC_CONFIG_SRCDIR([src/feature.h])
6AC_CONFIG_AUX_DIR(autoconf) 9AC_CONFIG_AUX_DIR(autoconf)
7AC_CONFIG_HEADER(config.h:autoconf/config.h.in) 10AC_CONFIG_HEADER(config.h:autoconf/config.h.in)
11
12AC_CANONICAL_HOST
8 13
9dnl RXVT version 14dnl RXVT version
10changequote(, )dnl 15changequote(, )dnl
11VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 16VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
12DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 17DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
… …
30AC_PROG_INSTALL 35AC_PROG_INSTALL
31AC_PROG_AWK 36AC_PROG_AWK
32 37
33AC_LANG(C) 38AC_LANG(C)
34 39
40dnl# --------------------------------------------------------------------------
41dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
42dnl#
43if test -z "$orig_CXXFLAGS"; then
44 CXXFLAGS='-O'
45 if test x$GCC = xyes && test "x$GXX" = xyes; then
46 CXXFLAGS="-g -O3"
47 fi
48 CFLAGS="$CXXFLAGS"
49fi
50
35LINKER="$CXX" 51LINKER="$CXX"
36if test x$GCC = xyes && test x$GXX = xyes; then 52if test x$GCC = xyes && test x$GXX = xyes; then
37 AC_CHECK_LIB(supc++, main, [ 53 AC_CHECK_LIB(supc++, main, [
38 LINKER="$CC" 54 LINKER="$CC"
39 LIBS="$LIBS -lsupc++" 55 LIBS="$LIBS -lsupc++"
40 ]) 56 ])
41fi 57fi
42AC_SUBST(LINKER,[$LINKER]) 58AC_SUBST(LINKER,[$LINKER])
43 59
44CPPFLAGS="-D_GNU_SOURCE -D_XOPEN_SOURCE" 60AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)
61
62case $host in
63 *-*-solaris* )
64 AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
65 AC_DEFINE(_XOPEN_SOURCE, 2, Needed to get declarations for msg_control and msg_controllen on Solaris)
66 AC_DEFINE(__EXTENSIONS__, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
67 ;;
68esac
45 69
46dnl if test x$GXX = xyes; then 70dnl if test x$GXX = xyes; then
47dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now... 71dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now...
48dnl fi 72dnl fi
49 73
… …
65AC_PROG_LIBTOOL()dnl# libtool 89AC_PROG_LIBTOOL()dnl# libtool
66 90
67MALLOC_TYPE=S 91MALLOC_TYPE=S
68support_addstrings=no 92support_addstrings=no
69support_frills=no 93support_frills=no
70support_linespace=no
71support_inheritpixmap=no 94support_inheritpixmap=no
72support_tinting=no 95support_tinting=no
73support_fading=no 96support_fading=no
74support_keepscrolling=no 97support_keepscrolling=no
75support_selectionscrolling=no 98support_selectionscrolling=no
… …
90support_xpm=no 113support_xpm=no
91support_xft=no 114support_xft=no
92support_unicode3=no 115support_unicode3=no
93support_combining=no 116support_combining=no
94support_8bitctrls=no 117support_8bitctrls=no
118support_iso14755=no
119support_styles=no
95codesets= 120codesets=
96 121
97dnl# -------------------------------------------------------------------------- 122dnl# --------------------------------------------------------------------------
98dnl# CHECKING COMMAND LINE OPTIONS 123dnl# CHECKING COMMAND LINE OPTIONS
99dnl# -------------------------------------------------------------------------- 124dnl# --------------------------------------------------------------------------
… …
109 NOTE: this option is order dependent 134 NOTE: this option is order dependent
110 NOTE: automatically enabled with --enable-shared], 135 NOTE: automatically enabled with --enable-shared],
111 [if test x$enableval = xyes; then 136 [if test x$enableval = xyes; then
112 support_24bit=yes 137 support_24bit=yes
113 support_frills=yes 138 support_frills=yes
114 support_linespace=yes
115 support_inheritpixmap=yes 139 support_inheritpixmap=yes
116 support_tinting=yes 140 support_tinting=yes
117 support_fading=yes 141 support_fading=yes
118 support_keepscrolling=yes 142 support_keepscrolling=yes
119 support_selectionscrolling=yes 143 support_selectionscrolling=yes
… …
134 support_xpm=yes 158 support_xpm=yes
135 support_xft=yes 159 support_xft=yes
136 support_unicode3=yes 160 support_unicode3=yes
137 support_combining=yes 161 support_combining=yes
138 #support_8bitctrls=yes 162 #support_8bitctrls=yes
163 support_iso14755=yes
164 support_styles=yes
139 codesets=all 165 codesets=all
140 fi]) 166 fi])
141 167
142AC_ARG_ENABLE(unicode3, 168AC_ARG_ENABLE(unicode3,
143 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters], 169 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters],
144 [if test x$enableval = xyes -o x$enableval = xno; then 170 [if test x$enableval = xyes -o x$enableval = xno; then
145 support_unicode3=yes 171 support_unicode3=$enableval
146 fi]) 172 fi])
147 173
148AC_ARG_ENABLE(combining, 174AC_ARG_ENABLE(combining,
149 [ --enable-combining enable composition of base and combining characters], 175 [ --enable-combining enable composition of base and combining characters],
150 [if test x$enableval = xyes -o x$enableval = xno; then 176 [if test x$enableval = xyes -o x$enableval = xno; then
151 support_combining=yes 177 support_combining=$enableval
152 fi]) 178 fi])
153 179
154AC_ARG_ENABLE(xft, 180AC_ARG_ENABLE(xft,
155 [ --enable-xft enable xft support on systems that have it], 181 [ --enable-xft enable xft support on systems that have it],
156 [if test x$enableval = xyes -o x$enableval = xno; then 182 [if test x$enableval = xyes -o x$enableval = xno; then
157 support_xft=yes 183 support_xft=$enableval
184 fi])
185
186AC_ARG_ENABLE(font-styles,
187 [ --enable-font-styles enable bold and italic support],
188 [if test x$enableval = xyes -o x$enableval = xno; then
189 support_styles=$enableval
158 fi]) 190 fi])
159 191
160AC_ARG_ENABLE(utmp, 192AC_ARG_ENABLE(utmp,
161 [ --enable-utmp enable utmp (utmpx) support], 193 [ --enable-utmp enable utmp (utmpx) support],
162 [if test x$enableval = xyes -o x$enableval = xno; then 194 [if test x$enableval = xyes -o x$enableval = xno; then
… …
234 [if test x$enableval = xyes; then 266 [if test x$enableval = xyes; then
235 AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less) 267 AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less)
236 fi]) 268 fi])
237 269
238AC_ARG_WITH(codesets, 270AC_ARG_WITH(codesets,
239 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,cn,cn_ext,all)], 271 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
240 [codesets="$withval"]) 272 [codesets="$withval"])
241 273
242AC_ARG_ENABLE(xim, 274AC_ARG_ENABLE(xim,
243 [ --enable-xim XIM (X Input Method) protocol support], 275 [ --enable-xim XIM (X Input Method) protocol support],
244 [if test x$enableval = xyes -o x$enableval = xno; then 276 [if test x$enableval = xyes -o x$enableval = xno; then
… …
276 fi]) 308 fi])
277 309
278AC_ARG_ENABLE(8bitctrls, 310AC_ARG_ENABLE(8bitctrls,
279 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)], 311 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)],
280 [if test x$enableval = xyes -o x$enableval = xno; then 312 [if test x$enableval = xyes -o x$enableval = xno; then
281 support_8bitctrls=yes 313 support_8bitctrls=$enableval
282 fi]) 314 fi])
283 315
284RESFALLBACK=Rxvt 316RESFALLBACK=Rxvt
285AC_ARG_ENABLE(fallback, 317AC_ARG_ENABLE(fallback,
286 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)], 318 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)],
… …
308 340
309RXVTNAME=urxvt 341RXVTNAME=urxvt
310AC_ARG_WITH(name, 342AC_ARG_WITH(name,
311 [ --with-name=NAME set the basename for the installed binaries (default: urxvt)], 343 [ --with-name=NAME set the basename for the installed binaries (default: urxvt)],
312 [RXVTNAME="$withval"]) 344 [RXVTNAME="$withval"])
345AC_DEFINE_UNQUOTED(RXVTNAME,"$RXVTNAME", [Binary base name])
313 346
314RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"` 347RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"`
315AC_SUBST(RXVTNAME) 348AC_SUBST(RXVTNAME)
316 349
317AC_ARG_ENABLE(strings, 350AC_ARG_ENABLE(strings,
… …
324 [ --disable-swapscreen disable swap screen support], 357 [ --disable-swapscreen disable swap screen support],
325 [if test x$enableval = xno; then 358 [if test x$enableval = xno; then
326 AC_DEFINE(NO_SECONDARY_SCREEN, 1, Disable the secondary screen. Many programs use the secondary screen as their workplace) 359 AC_DEFINE(NO_SECONDARY_SCREEN, 1, Disable the secondary screen. Many programs use the secondary screen as their workplace)
327 fi]) 360 fi])
328 361
362AC_ARG_ENABLE(iso14755,
363 [ --enable-iso14755 enable support for extended ISO 14755 modes],
364 [if test x$enableval = xyes -o x$enableval = xno; then
365 support_iso14755=$enableval
366 fi])
367
329AC_ARG_ENABLE(frills, 368AC_ARG_ENABLE(frills,
330 [ --enable-frills enable support for rarely used features], 369 [ --enable-frills enable support for rarely used features],
331 [if test x$enableval = xyes -o x$enableval = xno; then 370 [if test x$enableval = xyes -o x$enableval = xno; then
332 support_frills=$enableval 371 support_frills=$enableval
333 fi])
334
335AC_ARG_ENABLE(linespace,
336 [ --enable-linespace enable support for linespace],
337 [if test x$enableval = xyes -o x$enableval = xno; then
338 support_linespace=$enableval
339 fi]) 372 fi])
340 373
341AC_ARG_ENABLE(24bit, 374AC_ARG_ENABLE(24bit,
342 [ --enable-24bit enable support for using 24bit visuals if available], 375 [ --enable-24bit enable support for using 24bit visuals if available],
343 [if test x$enableval = xyes -o x$enableval = xno; then 376 [if test x$enableval = xyes -o x$enableval = xno; then
… …
391 [ --enable-smart-resize enable smart growth/shrink behaviour], 424 [ --enable-smart-resize enable smart growth/shrink behaviour],
392 [if test x$enableval = xyes; then 425 [if test x$enableval = xyes; then
393 AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior) 426 AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior)
394 fi]) 427 fi])
395 428
396AC_ARG_ENABLE(256-color,
397 [ --enable-256-color enable 256-color support],
398 [if test x$enableval = xyes; then
399 AC_DEFINE(TTY_256COLOR, 1, Define if you want 256 colour support)
400 fi])
401
402AC_ARG_ENABLE(cursor-blink, 429AC_ARG_ENABLE(cursor-blink,
403 [ --enable-cursor-blink enable blinking cursor], 430 [ --enable-cursor-blink enable blinking cursor],
404 [if test x$enableval = xyes -o x$enableval = xno; then 431 [if test x$enableval = xyes -o x$enableval = xno; then
405 support_cursor_blink=$enableval 432 support_cursor_blink=$enableval
406 fi]) 433 fi])
… …
430 fi]) 457 fi])
431 458
432dnl# -------------------------------------------------------------------------- 459dnl# --------------------------------------------------------------------------
433 460
434AC_DEFINE(PROTOTYPES, 1, Define if you need function prototypes) 461AC_DEFINE(PROTOTYPES, 1, Define if you need function prototypes)
435
436dnl# --------------------------------------------------------------------------
437dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
438dnl#
439if test -z "$CFLAGS"; then
440 if test -z "$CCOPTS"; then
441 CCOPTS='-O'
442dnl> if test "x$GCC" = xyes; then
443dnl> if test x$system = xLinux; then
444dnl> CCOPTS="$CCOPTS "'-O2 -fno-strength-reduce'
445dnl> fi
446dnl> fi
447 fi
448 CFLAGS="$CCOPTS"
449fi
450 462
451AC_PATH_PROG(MV, mv, mv) 463AC_PATH_PROG(MV, mv, mv)
452AC_PATH_PROG(RM, rm, rm) 464AC_PATH_PROG(RM, rm, rm)
453AC_PATH_PROG(CP, cp, cp) 465AC_PATH_PROG(CP, cp, cp)
454AC_PATH_PROG(LN, ln, ln) 466AC_PATH_PROG(LN, ln, ln)
455AC_PATH_PROG(SED, sed, sed) 467AC_PATH_PROG(SED, sed, sed)
456AC_PATH_PROG(ECHO, echo, echo) 468AC_PATH_PROG(ECHO, echo, echo)
457AC_PATH_PROG(CMP, cmp, cmp) 469AC_PATH_PROG(CMP, cmp, cmp)
458AC_PATH_PROG(TBL, tbl) 470AC_PATH_PROG(TBL, tbl)
471AC_PATH_PROG(TIC, tic)
459 472
460dnl# need a neat way to detect SVR4 or its features 473dnl# need a neat way to detect SVR4 or its features
461dnl# in src/command.c we use these functions: 474dnl# in src/command.c we use these functions:
462dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> 475dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
463dnl# - but are these also defined for other systems? 476dnl# - but are these also defined for other systems?
… …
500 sys/byteorder.h \ 513 sys/byteorder.h \
501 sys/ioctl.h \ 514 sys/ioctl.h \
502 sys/select.h \ 515 sys/select.h \
503 sys/sockio.h \ 516 sys/sockio.h \
504 sys/strredir.h \ 517 sys/strredir.h \
518 sys/stropts.h \
505 sys/time.h \ 519 sys/time.h \
506 utmp.h \ 520 utmp.h \
507 utmpx.h \ 521 utmpx.h \
508 stdint.h \ 522 stdint.h \
523 pty.h \
524 wchar.h \
525 cwchar \
526 clocale \
509) 527)
510 528
511AC_HEADER_TIME 529AC_HEADER_TIME
512 530
513dnl# check to allow both <termios.h> and <sys/ioctl.h> 531dnl# check to allow both <termios.h> and <sys/ioctl.h>
514AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl, 532AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
515[AC_TRY_COMPILE([#include <stdio.h> 533[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
516#include <sys/ioctl.h> 534#include <sys/ioctl.h>
517#ifdef HAVE_TERMIOS_H 535#ifdef HAVE_TERMIOS_H
518#include <termios.h> 536#include <termios.h>
519#endif], [int a = ECHO;], rxvt_cv_header_sysioctl=yes, rxvt_cv_header_sysioctl=no)]) 537#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
520 538
521dnl# ELF systems may want to store paths for dynamic libraries. 539dnl# ELF systems may want to store paths for dynamic libraries.
522dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath" 540dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath"
523dnl# At least one version of SunOS wants "-R path" but it's not checked yet. 541dnl# At least one version of SunOS wants "-R path" but it's not checked yet.
524if test -n "$GCC"; then 542if test -n "$GCC"; then
… …
533ac_save_CFLAGS=$CFLAGS 551ac_save_CFLAGS=$CFLAGS
534ac_save_LIBS=$LIBS 552ac_save_LIBS=$LIBS
535CFLAGS="$CFLAGS $X_CFLAGS" 553CFLAGS="$CFLAGS $X_CFLAGS"
536LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` 554LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
537AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath, 555AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath,
538[AC_TRY_RUN([ 556[AC_RUN_IFELSE([AC_LANG_SOURCE([[
539main() 557main()
540{ 558{
541 exit(0); 559 exit(0);
542 (void) XOpenDisplay("foobar"); 560 (void) XOpenDisplay("foobar");
543}], rxvt_cv_rpath=yes, rxvt_cv_rpath=no, dnl 561}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
544 AC_MSG_WARN([You may need to check the LIBS line]))]) 562 AC_MSG_WARN(You may need to check the LIBS line)])])
545if test x$rxvt_cv_rpath != xyes; then 563if test x$rxvt_cv_rpath != xyes; then
546 changequote(, )dnl 564 changequote(, )dnl
547 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g' 565 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
548 changequote([, ])dnl 566 changequote([, ])dnl
549 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` 567 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
550 AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R, 568 AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R,
551[AC_TRY_RUN([ 569[AC_RUN_IFELSE([AC_LANG_SOURCE([[
552main() 570main()
553{ 571{
554 exit(0); 572 exit(0);
555 (void) XOpenDisplay("foobar"); 573 (void) XOpenDisplay("foobar");
556}], rxvt_cv_R=yes, rxvt_cv_R=no, rxvt_cv_R=no)]) 574}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])
557 if test x$rxvt_cv_R != xyes; then 575 if test x$rxvt_cv_R != xyes; then
558 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 576 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
559 fi 577 fi
560fi 578fi
561 579
562AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 580AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
563[AC_TRY_COMPILE([#include <X11/Xlib.h>], [XPointer dummy;], 581[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
564rxvt_cv_xpointer=yes, rxvt_cv_xpointer=no)])
565if test x$rxvt_cv_xpointer = xyes; then 582if test x$rxvt_cv_xpointer = xyes; then
566 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 583 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
567fi 584fi
568LIBS=$ac_save_LIBS 585LIBS=$ac_save_LIBS
569CFLAGS=$ac_save_CFLAGS 586CFLAGS=$ac_save_CFLAGS
… …
582dnl> AC_CHECK_TYPE(umode_t, int) 599dnl> AC_CHECK_TYPE(umode_t, int)
583dnl> AC_CHECK_TYPE(off_t, long) 600dnl> AC_CHECK_TYPE(off_t, long)
584AC_TYPE_PID_T 601AC_TYPE_PID_T
585AC_TYPE_UID_T 602AC_TYPE_UID_T
586 603
587
588AC_CHECK_SIZEOF(char, 1)
589AC_CHECK_SIZEOF(short, 2) 604AC_CHECK_SIZEOF(short, 2)
590AC_CHECK_SIZEOF(int, 4) 605AC_CHECK_SIZEOF(int, 4)
591AC_CHECK_SIZEOF(long, 4) 606dnl AC_CHECK_SIZEOF(long, 4)
592AC_CHECK_SIZEOF(long long, 8) 607AC_CHECK_SIZEOF(long long, 8)
593AC_CHECK_SIZEOF(int *, 4) 608AC_CHECK_SIZEOF(int *, 4)
594 609
595dnl# see usage below 610dnl# see usage below
596AC_DEFUN(RXVT_CHECK_SIZE, 611AC_DEFUN(RXVT_CHECK_SIZE,
597 [AC_CACHE_CHECK([for $2], $1, 612 [AC_CACHE_CHECK([for $2], $1,
598 [AC_TRY_COMPILE([#include <stdint.h>], $2 dummy;, 613 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl
599 [$1=yes],
600 [dnl
601if test $ac_cv_sizeof_char -ge $3; then 614if test "$ac_cv_sizeof_char" -ge $3; then
602 $1="$4 char" 615 $1="$4 char"
603else 616else
604 if test $ac_cv_sizeof_short -ge $3; then 617 if test "$ac_cv_sizeof_short" -ge $3; then
605 $1="$4 short" 618 $1="$4 short"
606 else 619 else
607 if test $ac_cv_sizeof_int -ge $3; then 620 if test "$ac_cv_sizeof_int" -ge $3; then
608 $1="$4 int" 621 $1="$4 int"
609 else 622 else
610 if test $ac_cv_sizeof_long -ge $3; then 623 if test "$ac_cv_sizeof_long" -ge $3; then
611 $1="$4 long" 624 $1="$4 long"
612 else 625 else
613 if test $ac_cv_sizeof_long_long -ge $3; then 626 if test "$ac_cv_sizeof_long_long" -ge $3; then
614 $1="$4 long long" 627 $1="$4 long long"
615 else 628 else
616 $1="$4 $5" # we _must_ have a (possibly wrong) default 629 $1="$4 $5" # we _must_ have a (possibly wrong) default
617 fi 630 fi
618 fi 631 fi
… …
645dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef) 658dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
646dnl AC_SUBST(rxvt_uint64_typedef) 659dnl AC_SUBST(rxvt_uint64_typedef)
647dnl# 660dnl#
648dnl# Now look for another we use 661dnl# Now look for another we use
649dnl# 662dnl#
650if test $ac_cv_sizeof_int_p -eq 8; then 663if test "$ac_cv_sizeof_int_p" -eq 8; then
651 rxvt_intp_define="#define intp_t int64_t" 664 rxvt_intp_define="#define intp_t int64_t"
652 rxvt_u_intp_define="#define u_intp_t u_int64_t" 665 rxvt_u_intp_define="#define u_intp_t u_int64_t"
653else 666else
654 if test $ac_cv_sizeof_int_p -eq 4; then 667 if test "$ac_cv_sizeof_int_p" -eq 4; then
655 rxvt_intp_define="#define intp_t int32_t" 668 rxvt_intp_define="#define intp_t int32_t"
656 rxvt_u_intp_define="#define u_intp_t u_int32_t" 669 rxvt_u_intp_define="#define u_intp_t u_int32_t"
657 else 670 else
658 if test $ac_cv_sizeof_int_p -eq 2; then 671 if test "$ac_cv_sizeof_int_p" -eq 2; then
659 rxvt_intp_define="#define intp_t int16_t" 672 rxvt_intp_define="#define intp_t int16_t"
660 rxvt_u_intp_define="#define u_intp_t u_int16_t" 673 rxvt_u_intp_define="#define u_intp_t u_int16_t"
661 else 674 else
662 rxvt_intp_define="#error set intp_t" 675 rxvt_intp_define="#error set intp_t"
663 rxvt_u_intp_define="#error set u_intp_t" 676 rxvt_u_intp_define="#error set u_intp_t"
… …
707dnl# check for host field in utmp structure 720dnl# check for host field in utmp structure
708 721
709dnl# -------------------------------------------- 722dnl# --------------------------------------------
710AC_CHECK_HEADER(utmp.h, 723AC_CHECK_HEADER(utmp.h,
711[AC_CACHE_CHECK([for struct utmp], rxvt_cv_struct_utmp, 724[AC_CACHE_CHECK([for struct utmp], rxvt_cv_struct_utmp,
712[AC_TRY_COMPILE([#include <sys/types.h> 725[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
713#include <stdint.h> 726#include <stdint.h>
714#include <utmp.h>], 727#include <utmp.h>]], [[struct utmp ut;]])],[rxvt_cv_struct_utmp=yes],[rxvt_cv_struct_utmp=no])])
715[struct utmp ut;],
716rxvt_cv_struct_utmp=yes, rxvt_cv_struct_utmp=no)])
717if test x$rxvt_cv_struct_utmp = xyes; then 728if test x$rxvt_cv_struct_utmp = xyes; then
718 AC_DEFINE(HAVE_STRUCT_UTMP, 1, Define if utmp.h has struct utmp) 729 AC_DEFINE(HAVE_STRUCT_UTMP, 1, Define if utmp.h has struct utmp)
719fi 730fi
720] 731]
721 732
722AC_CACHE_CHECK(for ut_host in utmp struct, rxvt_cv_struct_utmp_host, 733AC_CACHE_CHECK(for ut_host in utmp struct, rxvt_cv_struct_utmp_host,
723[AC_TRY_COMPILE([#include <sys/types.h> 734[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
724#include <utmp.h>], 735#include <utmp.h>]], [[struct utmp ut; ut.ut_host;]])],[rxvt_cv_struct_utmp_host=yes],[rxvt_cv_struct_utmp_host=no])])
725[struct utmp ut; ut.ut_host;],
726rxvt_cv_struct_utmp_host=yes, rxvt_cv_struct_utmp_host=no)])
727if test x$rxvt_cv_struct_utmp_host = xyes; then 736if test x$rxvt_cv_struct_utmp_host = xyes; then
728 AC_DEFINE(HAVE_UTMP_HOST, 1, Define if struct utmp contains ut_host) 737 AC_DEFINE(HAVE_UTMP_HOST, 1, Define if struct utmp contains ut_host)
729fi 738fi
730 739
731AC_CACHE_CHECK(for ut_pid in utmp struct, rxvt_cv_struct_utmp_pid, 740AC_CACHE_CHECK(for ut_pid in utmp struct, rxvt_cv_struct_utmp_pid,
732[AC_TRY_COMPILE([#include <sys/types.h> 741[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
733#include <utmp.h>], 742#include <utmp.h>]], [[struct utmp ut; ut.ut_pid;]])],[rxvt_cv_struct_utmp_pid=yes],[rxvt_cv_struct_utmp_pid=no])])
734[struct utmp ut; ut.ut_pid;],
735rxvt_cv_struct_utmp_pid=yes, rxvt_cv_struct_utmp_pid=no)])
736if test x$rxvt_cv_struct_utmp_pid = xyes; then 743if test x$rxvt_cv_struct_utmp_pid = xyes; then
737 AC_DEFINE(HAVE_UTMP_PID, 1, Define if struct utmp contains ut_pid) 744 AC_DEFINE(HAVE_UTMP_PID, 1, Define if struct utmp contains ut_pid)
738fi 745fi
739) dnl# AC_CHECK_HEADER(utmp.h 746) dnl# AC_CHECK_HEADER(utmp.h
740 747
741dnl# -------------------------------------------- 748dnl# --------------------------------------------
742 749
743AC_CHECK_HEADER(utmpx.h, 750AC_CHECK_HEADER(utmpx.h,
744[AC_CACHE_CHECK([for struct utmpx], rxvt_cv_struct_utmpx, 751[AC_CACHE_CHECK([for struct utmpx], rxvt_cv_struct_utmpx,
745[AC_TRY_COMPILE([#include <sys/types.h> 752[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
746#include <utmpx.h>], 753#include <utmpx.h>]], [[struct utmpx ut;]])],[rxvt_cv_struct_utmpx=yes],[rxvt_cv_struct_utmpx=no])])
747[struct utmpx ut;],
748rxvt_cv_struct_utmpx=yes, rxvt_cv_struct_utmpx=no)])
749if test x$rxvt_cv_struct_utmpx = xyes; then 754if test x$rxvt_cv_struct_utmpx = xyes; then
750 AC_DEFINE(HAVE_STRUCT_UTMPX, 1, Define if utmpx.h has struct utmpx) 755 AC_DEFINE(HAVE_STRUCT_UTMPX, 1, Define if utmpx.h has struct utmpx)
751fi 756fi
752] 757]
753 758
754AC_CACHE_CHECK(for host in utmpx struct, rxvt_cv_struct_utmpx_host, 759AC_CACHE_CHECK(for host in utmpx struct, rxvt_cv_struct_utmpx_host,
755[AC_TRY_COMPILE([#include <sys/types.h> 760[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
756#include <utmpx.h>], 761#include <utmpx.h>]], [[struct utmpx utx; utx.ut_host;]])],[rxvt_cv_struct_utmpx_host=yes],[rxvt_cv_struct_utmpx_host=no])])
757[struct utmpx utx; utx.ut_host;],
758rxvt_cv_struct_utmpx_host=yes, rxvt_cv_struct_utmpx_host=no)])
759if test x$rxvt_cv_struct_utmpx_host = xyes; then 762if test x$rxvt_cv_struct_utmpx_host = xyes; then
760 AC_DEFINE(HAVE_UTMPX_HOST, 1, Define if struct utmpx contains ut_host) 763 AC_DEFINE(HAVE_UTMPX_HOST, 1, Define if struct utmpx contains ut_host)
761fi 764fi
762) dnl# AC_CHECK_HEADER(utmpx.h 765) dnl# AC_CHECK_HEADER(utmpx.h
763 766
764 767
765dnl# -------------------------------------------------------------------------- 768dnl# --------------------------------------------------------------------------
766dnl# check for struct lastlog 769dnl# check for struct lastlog
767AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog, 770AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog,
768[AC_TRY_COMPILE([#include <sys/types.h> 771[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
769#include <utmp.h> 772#include <utmp.h>
770#ifdef HAVE_LASTLOG_H 773#ifdef HAVE_LASTLOG_H
771#include <lastlog.h> 774#include <lastlog.h>
772#endif 775#endif
773],
774[struct lastlog ll;],
775rxvt_cv_struct_lastlog=yes, rxvt_cv_struct_lastlog=no)]) 776]], [[struct lastlog ll;]])],[rxvt_cv_struct_lastlog=yes],[rxvt_cv_struct_lastlog=no])])
776if test x$rxvt_cv_struct_lastlog = xyes; then 777if test x$rxvt_cv_struct_lastlog = xyes; then
777 AC_DEFINE(HAVE_STRUCT_LASTLOG, 1, Define if utmp.h or lastlog.h has struct lastlog) 778 AC_DEFINE(HAVE_STRUCT_LASTLOG, 1, Define if utmp.h or lastlog.h has struct lastlog)
778fi 779fi
779 780
780dnl# check for struct lastlogx 781dnl# check for struct lastlogx
781AC_CACHE_CHECK(for struct lastlogx, rxvt_cv_struct_lastlogx, 782AC_CACHE_CHECK(for struct lastlogx, rxvt_cv_struct_lastlogx,
782[AC_TRY_COMPILE([#include <sys/types.h> 783[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
783#include <utmpx.h> 784#include <utmpx.h>
784#ifdef HAVE_LASTLOG_H 785#ifdef HAVE_LASTLOG_H
785#include <lastlog.h> 786#include <lastlog.h>
786#endif 787#endif
787],
788[struct lastlogx ll;],
789rxvt_cv_struct_lastlogx=yes, rxvt_cv_struct_lastlogx=no)]) 788]], [[struct lastlogx ll;]])],[rxvt_cv_struct_lastlogx=yes],[rxvt_cv_struct_lastlogx=no])])
790if test x$rxvt_cv_struct_lastlogx = xyes; then 789if test x$rxvt_cv_struct_lastlogx = xyes; then
791 AC_DEFINE(HAVE_STRUCT_LASTLOGX, 1, Define if utmpx.h or lastlog.h has struct lastlogx) 790 AC_DEFINE(HAVE_STRUCT_LASTLOGX, 1, Define if utmpx.h or lastlog.h has struct lastlogx)
792fi 791fi
793 792
794dnl# -------------------------------------------------------------------------- 793dnl# --------------------------------------------------------------------------
795dnl# FIND FILES 794dnl# FIND FILES
796dnl# -------------------------------------------------------------------------- 795dnl# --------------------------------------------------------------------------
797 796
798dnl# find utmp 797dnl# find utmp
799AC_CACHE_CHECK(where utmp is located, rxvt_cv_path_utmp, 798AC_CACHE_CHECK(where utmp is located, rxvt_cv_path_utmp,
800[AC_TRY_RUN([#include <stdio.h> 799[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
801#include <sys/types.h> 800#include <sys/types.h>
802#include <utmp.h> 801#include <utmp.h>
803#include <errno.h> 802#include <errno.h>
804main() 803main()
805{ 804{
… …
820 fprintf(f, "%s\n", *u); 819 fprintf(f, "%s\n", *u);
821 exit(0); 820 exit(0);
822 } 821 }
823 } 822 }
824 exit(0); 823 exit(0);
825}], rxvt_cv_path_utmp=`cat conftestval`, rxvt_cv_path_utmp=, dnl 824}]])],[rxvt_cv_path_utmp=`cat conftestval`],[rxvt_cv_path_utmp=],[dnl
826 AC_MSG_WARN([Define RXVT_UTMP_FILE in config.h manually]))]) 825 AC_MSG_WARN(Define RXVT_UTMP_FILE in config.h manually)])])
827if test x$rxvt_cv_path_utmp != x; then 826if test x$rxvt_cv_path_utmp != x; then
828 AC_DEFINE_UNQUOTED(RXVT_UTMP_FILE, "$rxvt_cv_path_utmp", Define location of utmp) 827 AC_DEFINE_UNQUOTED(RXVT_UTMP_FILE, "$rxvt_cv_path_utmp", Define location of utmp)
829fi 828fi
830 829
831dnl# -------------------------------------------------------------------------- 830dnl# --------------------------------------------------------------------------
832 831
833dnl# find utmpx - if a utmp file exists at the same location and is more than 832dnl# find utmpx - if a utmp file exists at the same location and is more than
834dnl# a day newer, then dump the utmpx. People leave lots of junk around. 833dnl# a day newer, then dump the utmpx. People leave lots of junk around.
835AC_CACHE_CHECK(where utmpx is located, rxvt_cv_path_utmpx, 834AC_CACHE_CHECK(where utmpx is located, rxvt_cv_path_utmpx,
836[AC_TRY_RUN([#include <stdio.h> 835[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
837#include <sys/types.h> 836#include <sys/types.h>
838#include <utmpx.h> 837#include <utmpx.h>
839#include <errno.h> 838#include <errno.h>
840#include <sys/stat.h> 839#include <sys/stat.h>
841#ifdef HAVE_STRING_H 840#ifdef HAVE_STRING_H
… …
866 fprintf(f, "%s\n", *u); 865 fprintf(f, "%s\n", *u);
867 exit(0); 866 exit(0);
868 } 867 }
869 } 868 }
870 exit(0); 869 exit(0);
871}], rxvt_cv_path_utmpx=`cat conftestval`, rxvt_cv_path_utmpx=, dnl 870}]])],[rxvt_cv_path_utmpx=`cat conftestval`],[rxvt_cv_path_utmpx=],[dnl
872 AC_MSG_WARN([Define RXVT_UTMPX_FILE in config.h manually]))]) 871 AC_MSG_WARN(Define RXVT_UTMPX_FILE in config.h manually)])])
873if test x$rxvt_cv_path_utmpx != x; then 872if test x$rxvt_cv_path_utmpx != x; then
874 AC_DEFINE_UNQUOTED(RXVT_UTMPX_FILE, "$rxvt_cv_path_utmpx", Define location of utmpx) 873 AC_DEFINE_UNQUOTED(RXVT_UTMPX_FILE, "$rxvt_cv_path_utmpx", Define location of utmpx)
875fi 874fi
876 875
877dnl# -------------------------------------------------------------------------- 876dnl# --------------------------------------------------------------------------
878 877
879dnl# find wtmp 878dnl# find wtmp
880AC_CACHE_CHECK(where wtmp is located, rxvt_cv_path_wtmp, 879AC_CACHE_CHECK(where wtmp is located, rxvt_cv_path_wtmp,
881[AC_TRY_RUN([#include <stdio.h> 880[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
882#include <sys/types.h> 881#include <sys/types.h>
883#ifdef HAVE_UTMP_H 882#ifdef HAVE_UTMP_H
884#include <utmp.h> 883#include <utmp.h>
885#endif 884#endif
886#include <errno.h> 885#include <errno.h>
… …
903 fprintf(f, "%s\n", *w); 902 fprintf(f, "%s\n", *w);
904 exit(0); 903 exit(0);
905 } 904 }
906 } 905 }
907 exit(0); 906 exit(0);
908}], rxvt_cv_path_wtmp=`cat conftestval`, rxvt_cv_path_wtmp=, dnl 907}]])],[rxvt_cv_path_wtmp=`cat conftestval`],[rxvt_cv_path_wtmp=],[dnl
909 AC_MSG_WARN([Define RXVT_WTMP_FILE in config.h manually]))]) 908 AC_MSG_WARN(Define RXVT_WTMP_FILE in config.h manually)])])
910if test x$rxvt_cv_path_wtmp != x; then 909if test x$rxvt_cv_path_wtmp != x; then
911 AC_DEFINE_UNQUOTED(RXVT_WTMP_FILE, "$rxvt_cv_path_wtmp", Define location of wtmp) 910 AC_DEFINE_UNQUOTED(RXVT_WTMP_FILE, "$rxvt_cv_path_wtmp", Define location of wtmp)
912fi 911fi
913dnl# -------------------------------------------------------------------------- 912dnl# --------------------------------------------------------------------------
914 913
915dnl# find wtmpx 914dnl# find wtmpx
916AC_CACHE_CHECK(where wtmpx is located, rxvt_cv_path_wtmpx, 915AC_CACHE_CHECK(where wtmpx is located, rxvt_cv_path_wtmpx,
917[AC_TRY_RUN([#include <stdio.h> 916[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
918#ifdef HAVE_UTMPX_H 917#ifdef HAVE_UTMPX_H
919#include <utmpx.h> 918#include <utmpx.h>
920#endif 919#endif
921#include <errno.h> 920#include <errno.h>
922main() 921main()
… …
938 fprintf(f, "%s\n", *w); 937 fprintf(f, "%s\n", *w);
939 exit(0); 938 exit(0);
940 } 939 }
941 } 940 }
942 exit(0); 941 exit(0);
943}], rxvt_cv_path_wtmpx=`cat conftestval`, rxvt_cv_path_wtmpx=, dnl 942}]])],[rxvt_cv_path_wtmpx=`cat conftestval`],[rxvt_cv_path_wtmpx=],[dnl
944 AC_MSG_WARN([Define RXVT_WTMPX_FILE in config.h manually]))]) 943 AC_MSG_WARN(Define RXVT_WTMPX_FILE in config.h manually)])])
945if test x$rxvt_cv_path_wtmpx != x; then 944if test x$rxvt_cv_path_wtmpx != x; then
946 AC_DEFINE_UNQUOTED(RXVT_WTMPX_FILE, "$rxvt_cv_path_wtmpx", Define location of wtmpx) 945 AC_DEFINE_UNQUOTED(RXVT_WTMPX_FILE, "$rxvt_cv_path_wtmpx", Define location of wtmpx)
947fi 946fi
948dnl# -------------------------------------------------------------------------- 947dnl# --------------------------------------------------------------------------
949 948
950dnl# find lastlog 949dnl# find lastlog
951AC_CACHE_CHECK(where lastlog is located, rxvt_cv_path_lastlog, 950AC_CACHE_CHECK(where lastlog is located, rxvt_cv_path_lastlog,
952[AC_TRY_RUN([#include <stdio.h> 951[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
953#include <sys/types.h> 952#include <sys/types.h>
954#ifdef HAVE_UTMPX_H 953#ifdef HAVE_UTMPX_H
955#include <utmpx.h> 954#include <utmpx.h>
956#elif defined(HAVE_UTMP_H) 955#elif defined(HAVE_UTMP_H)
957#include <utmp.h> 956#include <utmp.h>
… …
978 fprintf(f, "%s\n", *w); 977 fprintf(f, "%s\n", *w);
979 exit(0); 978 exit(0);
980 } 979 }
981 } 980 }
982 exit(0); 981 exit(0);
983}], rxvt_cv_path_lastlog=`cat conftestval`, rxvt_cv_path_lastlog=, dnl 982}]])],[rxvt_cv_path_lastlog=`cat conftestval`],[rxvt_cv_path_lastlog=],[dnl
984 AC_MSG_WARN([Define RXVT_LASTLOG_FILE in config.h manually]))]) 983 AC_MSG_WARN(Define RXVT_LASTLOG_FILE in config.h manually)])])
985if test x$rxvt_cv_path_lastlog != x; then 984if test x$rxvt_cv_path_lastlog != x; then
986 AC_DEFINE_UNQUOTED(RXVT_LASTLOG_FILE, "$rxvt_cv_path_lastlog", Define location of lastlog) 985 AC_DEFINE_UNQUOTED(RXVT_LASTLOG_FILE, "$rxvt_cv_path_lastlog", Define location of lastlog)
987 if test -d "$rxvt_cv_path_lastlog"; then 986 if test -d "$rxvt_cv_path_lastlog"; then
988 AC_DEFINE(LASTLOG_IS_DIR, 1, Define if lastlog is provided via a directory) 987 AC_DEFINE(LASTLOG_IS_DIR, 1, Define if lastlog is provided via a directory)
989 fi 988 fi
990fi 989fi
991dnl# -------------------------------------------------------------------------- 990dnl# --------------------------------------------------------------------------
992 991
993dnl# find lastlogx 992dnl# find lastlogx
994AC_CACHE_CHECK(where lastlogx is located, rxvt_cv_path_lastlogx, 993AC_CACHE_CHECK(where lastlogx is located, rxvt_cv_path_lastlogx,
995[AC_TRY_RUN([#include <stdio.h> 994[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
996#ifdef HAVE_UTMPX_H 995#ifdef HAVE_UTMPX_H
997#include <utmpx.h> 996#include <utmpx.h>
998#endif 997#endif
999#include <errno.h> 998#include <errno.h>
1000main() 999main()
… …
1015 fprintf(f, "%s\n", *w); 1014 fprintf(f, "%s\n", *w);
1016 exit(0); 1015 exit(0);
1017 } 1016 }
1018 } 1017 }
1019 exit(0); 1018 exit(0);
1020}], rxvt_cv_path_lastlogx=`cat conftestval`, rxvt_cv_path_lastlogx=, dnl 1019}]])],[rxvt_cv_path_lastlogx=`cat conftestval`],[rxvt_cv_path_lastlogx=],[dnl
1021 AC_MSG_WARN([Define RXVT_LASTLOGX_FILE in config.h manually]))]) 1020 AC_MSG_WARN(Define RXVT_LASTLOGX_FILE in config.h manually)])])
1022if test x$rxvt_cv_path_lastlogx != x; then 1021if test x$rxvt_cv_path_lastlogx != x; then
1023 AC_DEFINE_UNQUOTED(RXVT_LASTLOGX_FILE, "$rxvt_cv_path_lastlogx", Define location of lastlogx) 1022 AC_DEFINE_UNQUOTED(RXVT_LASTLOGX_FILE, "$rxvt_cv_path_lastlogx", Define location of lastlogx)
1024fi 1023fi
1025 1024
1026dnl# -------------------------------------------------------------------------- 1025dnl# --------------------------------------------------------------------------
… …
1050LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 1049LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
1051if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then 1050if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
1052 LIBS=`echo $LIBS | sed "$R_TRANSLATE"` 1051 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
1053fi 1052fi
1054AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 1053AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
1055[AC_TRY_RUN([#include <X11/Xlib.h> 1054[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
1056main() { 1055main() {
1057char *p; 1056char *p;
1058if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 1057if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
1059exit (XSupportsLocale() ? 0 : 1); 1058exit (XSupportsLocale() ? 0 : 1);
1060else 1059else
1061exit (1);}], dnl 1060exit (1);}]])],[dnl
1062 rxvt_cv_func_xlocale=yes, rxvt_cv_func_xlocale=no, dnl 1061 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
1063 AC_MSG_WARN([Define NO_XLOCALE in config.h manually]))]) 1062 AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])])
1064if test x$rxvt_cv_func_xlocale = xyes; then 1063if test x$rxvt_cv_func_xlocale = xyes; then
1065 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works) 1064 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works)
1066fi 1065fi
1067 1066
1068AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, 1067AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
1069[AC_TRY_LINK([#define X_LOCALE 1 1068[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
1070#include <X11/Xlocale.h>], 1069#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
1071 [setlocale(LC_CTYPE, "");],
1072 rxvt_cv_func_xsetlocale=yes, rxvt_cv_func_xsetlocale=no)])
1073if test x$rxvt_cv_func_xsetlocale = xyes; then 1070if test x$rxvt_cv_func_xsetlocale = xyes; then
1074 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 1071 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
1075fi 1072fi
1076LIBS=$ac_save_LIBS 1073LIBS=$ac_save_LIBS
1077CFLAGS=$ac_save_CFLAGS 1074CFLAGS=$ac_save_CFLAGS
1078 1075
1079AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale, 1076AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
1080[AC_TRY_LINK([#include <clocale>], 1077[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])
1081 [setlocale(LC_CTYPE, "");],
1082 rxvt_cv_func_setlocale=yes, rxvt_cv_func_setlocale=no)])
1083if test x$rxvt_cv_func_setlocale = xyes; then 1078if test x$rxvt_cv_func_setlocale = xyes; then
1084 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works) 1079 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
1085fi 1080fi
1086 1081
1087AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo, 1082AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,
1088[AC_TRY_LINK([#include <langinfo.h>], 1083[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])])
1089 [nl_langinfo(CODESET);],
1090 rxvt_cv_func_nl_langinfo=yes, rxvt_cv_func_nl_langinfo=no)])
1091if test x$rxvt_cv_func_nl_langinfo = xyes; then 1084if test x$rxvt_cv_func_nl_langinfo = xyes; then
1092 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) 1085 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
1093fi 1086fi
1094 1087
1088AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
1089[AC_COMPILE_IFELSE([
1090#include <X11/Xlib.h>
1091
1092void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
1093
1094void f() {
1095 XIMCallback cb;
1096 cb.callback = im_destroy_cb;
1097}
1098],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)])
1099
1100if test x$rxvt_broken_ximcb = xyes; then
1101 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
1102fi
1103
1095AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt, 1104AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt,
1096[AC_TRY_LINK([#define _GNU_SOURCE 1105[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define _GNU_SOURCE
1097#ifdef HAVE_STDLIB_H 1106#ifdef HAVE_STDLIB_H
1098# include <cstdlib> 1107# include <cstdlib>
1099#endif], 1108#endif]], [[(void)getpt();]])],[rxvt_cv_func_getpt=yes],[rxvt_cv_func_getpt=no])])
1100 [(void)getpt();],
1101 rxvt_cv_func_getpt=yes, rxvt_cv_func_getpt=no)])
1102if test x$rxvt_cv_func_getpt = xyes; then 1109if test x$rxvt_cv_func_getpt = xyes; then
1103 AC_DEFINE(HAVE_GETPT, 1, Define if you have _GNU_SOURCE getpt() ) 1110 AC_DEFINE(HAVE_GETPT, 1, Define if you have _GNU_SOURCE getpt() )
1104fi 1111fi
1105 1112
1106dnl# if we don't guess right then it's up to the user 1113dnl# if we don't guess right then it's up to the user
… …
1164if test x$rxvt_cv_ptys = xBSD -o x$rxvt_cv_ptys = xHPUX -o x$rxvt_cv_ptys = xGLIBC; then 1171if test x$rxvt_cv_ptys = xBSD -o x$rxvt_cv_ptys = xHPUX -o x$rxvt_cv_ptys = xGLIBC; then
1165 AC_DEFINE(PTYS_ARE_SEARCHED, 1, Define for this pty type) 1172 AC_DEFINE(PTYS_ARE_SEARCHED, 1, Define for this pty type)
1166fi 1173fi
1167 1174
1168 1175
1169AC_CHECKING(for pty ranges) 1176AS_MESSAGE(checking for pty ranges...)
1170ptys=`echo /dev/pty??` 1177ptys=`echo /dev/pty??`
1171pch1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'` 1178pch1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'`
1172pch2=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'` 1179pch2=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'`
1173if test x$pch1 != x; then 1180if test x$pch1 != x; then
1174 AC_DEFINE_UNQUOTED(PTYCHAR1, "$pch1", Define for first char in devptyXX) 1181 AC_DEFINE_UNQUOTED(PTYCHAR1, "$pch1", Define for first char in devptyXX)
… …
1178fi 1185fi
1179 1186
1180dnl# -------------------------------------------------------------------------- 1187dnl# --------------------------------------------------------------------------
1181dnl# now add and remove other stuff 1188dnl# now add and remove other stuff
1182dnl# -------------------------------------------------------------------------- 1189dnl# --------------------------------------------------------------------------
1190if test x$support_xft = xyes; then
1191 LIBS="$LIBS `pkg-config xft --libs`"
1192 CFLAGS="$CFLAGS `pkg-config xft --cflags`"
1193 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
1194
1195 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
1196 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
1197
1198 if test x$support_xft = xyes; then
1199 AC_DEFINE(XFT, 1, Define to enable xft support)
1200 fi
1201fi
1202if test x$support_styles = xyes; then
1203 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
1204fi
1205if test x$support_iso14755 = xyes; then
1206 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
1207fi
1183if test x$support_8bitctrls = xyes; then 1208if test x$support_8bitctrls = xyes; then
1184 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences) 1209 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
1185fi 1210fi
1186if test x$support_fading = xyes; then 1211if test x$support_fading = xyes; then
1187 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) 1212 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
… …
1199 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen) 1224 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)
1200fi 1225fi
1201if test x$support_menubar = xyes; then 1226if test x$support_menubar = xyes; then
1202 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support) 1227 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support)
1203fi 1228fi
1204if test x$support_frills = xno; then 1229if test x$support_frills = xyes; then
1205 AC_DEFINE(NO_FRILLS, 1, Define if you don't want handling for rarely used features) 1230 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
1206fi
1207if test x$support_linespace = xno; then
1208 AC_DEFINE(NO_LINESPACE, 1, Define if you don't want support linespace)
1209fi 1231fi
1210if test x$support_24bit = xyes; then 1232if test x$support_24bit = xyes; then
1211 AC_DEFINE(PREFER_24BIT, 1, Define to use a 24 bit visual if the screen has 24 bit mode, even if the default is 8 bit) 1233 AC_DEFINE(PREFER_24BIT, 1, Define to use a 24 bit visual if the screen has 24 bit mode, even if the default is 8 bit)
1212fi 1234fi
1213if test x$support_mousewheel = xyes; then 1235if test x$support_mousewheel = xyes; then
… …
1263fi 1285fi
1264if test x$support_combining = xyes; then 1286if test x$support_combining = xyes; then
1265 AC_DEFINE(ENABLE_COMBINING, 1, Define if you want to automatically compose combining characters) 1287 AC_DEFINE(ENABLE_COMBINING, 1, Define if you want to automatically compose combining characters)
1266fi 1288fi
1267if test x$codesets = xall; then 1289if test x$codesets = xall; then
1268 codesets=jp,jp-ext,kr,cn,cn-ext 1290 codesets=jp,jp-ext,kr,zh,zh-ext
1269fi 1291fi
1292AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
1293AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
1270for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do 1294for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do
1271 AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
1272 AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
1273 case "$codeset" in 1295 case "$codeset" in
1274 JP ) AC_DEFINE(ENCODING_JP, 1, Define if you want japanese codesets) ;; 1296 JP ) AC_DEFINE(ENCODING_JP, 1, Define if you want japanese codesets) ;;
1275 JP_EXT ) AC_DEFINE(ENCODING_JP_EXT, 1, Define if you want extended japanese codesets) ;; 1297 JP_EXT ) AC_DEFINE(ENCODING_JP_EXT, 1, Define if you want extended japanese codesets) ;;
1276 KR ) AC_DEFINE(ENCODING_KR, 1, Define if you want korean codesets) ;; 1298 KR ) AC_DEFINE(ENCODING_KR, 1, Define if you want korean codesets) ;;
1277 CN ) AC_DEFINE(ENCODING_CN, 1, Define if you want chinese codesets) ;; 1299 ZH ) AC_DEFINE(ENCODING_ZH, 1, Define if you want chinese codesets) ;;
1278 CN_EXT ) AC_DEFINE(ENCODING_CN_EXT, 1, Define if you want extended chinese codesets) ;; 1300 ZH_EXT ) AC_DEFINE(ENCODING_ZH_EXT, 1, Define if you want extended chinese codesets) ;;
1279 esac 1301 esac
1280done 1302done
1281 1303
1282dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket) 1304dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket)
1283 1305
… …
1338RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch) 1360RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch)
1339RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch) 1361RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
1340RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch) 1362RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)
1341RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes) 1363RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
1342 1364
1343if test x$support_xft = xyes; then
1344 LIBS="$LIBS `pkg-config xft --libs`"
1345 CFLAGS="$CFLAGS `pkg-config xft --cflags`"
1346 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
1347
1348 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
1349 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
1350
1351 if test x$support_xft = xyes; then
1352 AC_DEFINE(XFT, 1, Define to enable xft support)
1353 fi
1354fi
1355
1356AC_OUTPUT(autoconf/Make.common \ 1365AC_CONFIG_FILES([autoconf/Make.common \
1357Makefile \ 1366Makefile \
1358doc/Makefile \ 1367doc/Makefile \
1359src/Makefile \ 1368src/Makefile \
1360src/test/Makefile \
1361src/rxvtlib.h \ 1369src/rxvtlib.h \
1362W11/Makefile \ 1370])
1363) 1371AC_OUTPUT
1364 1372
1365echo "Configuration: 1373echo "Configuration:
1366 1374
1367 Rxvt version: $VERSION : $DATE 1375 Rxvt version: $VERSION : $DATE
1368 Source code location: $srcdir 1376 Source code location: $srcdir

Diff Legend

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