ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/autoconf/configure.in
(Generate patch)

Comparing rxvt-unicode/autoconf/configure.in (file contents):
Revision 1.30 by root, Fri Jul 30 16:04:05 2004 UTC vs.
Revision 1.44 by root, Tue Jan 11 00:54:57 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) 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)
9
10AC_CANONICAL_HOST
8 11
9dnl RXVT version 12dnl RXVT version
10changequote(, )dnl 13changequote(, )dnl
11VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 14VERSION=`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` 15DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
… …
39 LIBS="$LIBS -lsupc++" 42 LIBS="$LIBS -lsupc++"
40 ]) 43 ])
41fi 44fi
42AC_SUBST(LINKER,[$LINKER]) 45AC_SUBST(LINKER,[$LINKER])
43 46
44CPPFLAGS="-D_GNU_SOURCE -D_XOPEN_SOURCE" 47AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)
48
49case $host in
50 *-*-solaris* )
51 AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
52 AC_DEFINE(_XOPEN_SOURCE, 2, Needed to get declarations for msg_control and msg_controllen on Solaris)
53 AC_DEFINE(__EXTENSIONS__, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
54 ;;
55esac
45 56
46dnl if test x$GXX = xyes; then 57dnl if test x$GXX = xyes; then
47dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now... 58dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now...
48dnl fi 59dnl fi
49 60
… …
65AC_PROG_LIBTOOL()dnl# libtool 76AC_PROG_LIBTOOL()dnl# libtool
66 77
67MALLOC_TYPE=S 78MALLOC_TYPE=S
68support_addstrings=no 79support_addstrings=no
69support_frills=no 80support_frills=no
70support_linespace=no
71support_inheritpixmap=no 81support_inheritpixmap=no
72support_tinting=no 82support_tinting=no
73support_fading=no 83support_fading=no
74support_keepscrolling=no 84support_keepscrolling=no
75support_selectionscrolling=no 85support_selectionscrolling=no
… …
90support_xpm=no 100support_xpm=no
91support_xft=no 101support_xft=no
92support_unicode3=no 102support_unicode3=no
93support_combining=no 103support_combining=no
94support_8bitctrls=no 104support_8bitctrls=no
105support_iso14755=no
106support_styles=no
95codesets= 107codesets=
96 108
97dnl# -------------------------------------------------------------------------- 109dnl# --------------------------------------------------------------------------
98dnl# CHECKING COMMAND LINE OPTIONS 110dnl# CHECKING COMMAND LINE OPTIONS
99dnl# -------------------------------------------------------------------------- 111dnl# --------------------------------------------------------------------------
… …
109 NOTE: this option is order dependent 121 NOTE: this option is order dependent
110 NOTE: automatically enabled with --enable-shared], 122 NOTE: automatically enabled with --enable-shared],
111 [if test x$enableval = xyes; then 123 [if test x$enableval = xyes; then
112 support_24bit=yes 124 support_24bit=yes
113 support_frills=yes 125 support_frills=yes
114 support_linespace=yes
115 support_inheritpixmap=yes 126 support_inheritpixmap=yes
116 support_tinting=yes 127 support_tinting=yes
117 support_fading=yes 128 support_fading=yes
118 support_keepscrolling=yes 129 support_keepscrolling=yes
119 support_selectionscrolling=yes 130 support_selectionscrolling=yes
… …
134 support_xpm=yes 145 support_xpm=yes
135 support_xft=yes 146 support_xft=yes
136 support_unicode3=yes 147 support_unicode3=yes
137 support_combining=yes 148 support_combining=yes
138 #support_8bitctrls=yes 149 #support_8bitctrls=yes
150 support_iso14755=yes
151 support_styles=yes
139 codesets=all 152 codesets=all
140 fi]) 153 fi])
141 154
142AC_ARG_ENABLE(unicode3, 155AC_ARG_ENABLE(unicode3,
143 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters], 156 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters],
144 [if test x$enableval = xyes -o x$enableval = xno; then 157 [if test x$enableval = xyes -o x$enableval = xno; then
145 support_unicode3=yes 158 support_unicode3=$enableval
146 fi]) 159 fi])
147 160
148AC_ARG_ENABLE(combining, 161AC_ARG_ENABLE(combining,
149 [ --enable-combining enable composition of base and combining characters], 162 [ --enable-combining enable composition of base and combining characters],
150 [if test x$enableval = xyes -o x$enableval = xno; then 163 [if test x$enableval = xyes -o x$enableval = xno; then
151 support_combining=yes 164 support_combining=$enableval
152 fi]) 165 fi])
153 166
154AC_ARG_ENABLE(xft, 167AC_ARG_ENABLE(xft,
155 [ --enable-xft enable xft support on systems that have it], 168 [ --enable-xft enable xft support on systems that have it],
156 [if test x$enableval = xyes -o x$enableval = xno; then 169 [if test x$enableval = xyes -o x$enableval = xno; then
157 support_xft=yes 170 support_xft=$enableval
171 fi])
172
173AC_ARG_ENABLE(font-styles,
174 [ --enable-font-styles enable bold and italic support],
175 [if test x$enableval = xyes -o x$enableval = xno; then
176 support_styles=$enableval
158 fi]) 177 fi])
159 178
160AC_ARG_ENABLE(utmp, 179AC_ARG_ENABLE(utmp,
161 [ --enable-utmp enable utmp (utmpx) support], 180 [ --enable-utmp enable utmp (utmpx) support],
162 [if test x$enableval = xyes -o x$enableval = xno; then 181 [if test x$enableval = xyes -o x$enableval = xno; then
… …
234 [if test x$enableval = xyes; then 253 [if test x$enableval = xyes; then
235 AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less) 254 AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less)
236 fi]) 255 fi])
237 256
238AC_ARG_WITH(codesets, 257AC_ARG_WITH(codesets,
239 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,cn,cn_ext,all)], 258 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
240 [codesets="$withval"]) 259 [codesets="$withval"])
241 260
242AC_ARG_ENABLE(xim, 261AC_ARG_ENABLE(xim,
243 [ --enable-xim XIM (X Input Method) protocol support], 262 [ --enable-xim XIM (X Input Method) protocol support],
244 [if test x$enableval = xyes -o x$enableval = xno; then 263 [if test x$enableval = xyes -o x$enableval = xno; then
… …
276 fi]) 295 fi])
277 296
278AC_ARG_ENABLE(8bitctrls, 297AC_ARG_ENABLE(8bitctrls,
279 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)], 298 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)],
280 [if test x$enableval = xyes -o x$enableval = xno; then 299 [if test x$enableval = xyes -o x$enableval = xno; then
281 support_8bitctrls=yes 300 support_8bitctrls=$enableval
282 fi]) 301 fi])
283 302
284RESFALLBACK=Rxvt 303RESFALLBACK=Rxvt
285AC_ARG_ENABLE(fallback, 304AC_ARG_ENABLE(fallback,
286 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)], 305 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)],
… …
308 327
309RXVTNAME=urxvt 328RXVTNAME=urxvt
310AC_ARG_WITH(name, 329AC_ARG_WITH(name,
311 [ --with-name=NAME set the basename for the installed binaries (default: urxvt)], 330 [ --with-name=NAME set the basename for the installed binaries (default: urxvt)],
312 [RXVTNAME="$withval"]) 331 [RXVTNAME="$withval"])
332AC_DEFINE_UNQUOTED(RXVTNAME,"$RXVTNAME", [Binary base name])
313 333
314RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"` 334RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"`
315AC_SUBST(RXVTNAME) 335AC_SUBST(RXVTNAME)
316 336
317AC_ARG_ENABLE(strings, 337AC_ARG_ENABLE(strings,
… …
324 [ --disable-swapscreen disable swap screen support], 344 [ --disable-swapscreen disable swap screen support],
325 [if test x$enableval = xno; then 345 [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) 346 AC_DEFINE(NO_SECONDARY_SCREEN, 1, Disable the secondary screen. Many programs use the secondary screen as their workplace)
327 fi]) 347 fi])
328 348
349AC_ARG_ENABLE(iso14755,
350 [ --enable-iso14755 enable support for extended ISO 14755 modes],
351 [if test x$enableval = xyes -o x$enableval = xno; then
352 support_iso14755=$enableval
353 fi])
354
329AC_ARG_ENABLE(frills, 355AC_ARG_ENABLE(frills,
330 [ --enable-frills enable support for rarely used features], 356 [ --enable-frills enable support for rarely used features],
331 [if test x$enableval = xyes -o x$enableval = xno; then 357 [if test x$enableval = xyes -o x$enableval = xno; then
332 support_frills=$enableval 358 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]) 359 fi])
340 360
341AC_ARG_ENABLE(24bit, 361AC_ARG_ENABLE(24bit,
342 [ --enable-24bit enable support for using 24bit visuals if available], 362 [ --enable-24bit enable support for using 24bit visuals if available],
343 [if test x$enableval = xyes -o x$enableval = xno; then 363 [if test x$enableval = xyes -o x$enableval = xno; then
… …
389 409
390AC_ARG_ENABLE(smart-resize, 410AC_ARG_ENABLE(smart-resize,
391 [ --enable-smart-resize enable smart growth/shrink behaviour], 411 [ --enable-smart-resize enable smart growth/shrink behaviour],
392 [if test x$enableval = xyes; then 412 [if test x$enableval = xyes; then
393 AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior) 413 AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior)
394 fi])
395
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]) 414 fi])
401 415
402AC_ARG_ENABLE(cursor-blink, 416AC_ARG_ENABLE(cursor-blink,
403 [ --enable-cursor-blink enable blinking cursor], 417 [ --enable-cursor-blink enable blinking cursor],
404 [if test x$enableval = xyes -o x$enableval = xno; then 418 [if test x$enableval = xyes -o x$enableval = xno; then
… …
454AC_PATH_PROG(LN, ln, ln) 468AC_PATH_PROG(LN, ln, ln)
455AC_PATH_PROG(SED, sed, sed) 469AC_PATH_PROG(SED, sed, sed)
456AC_PATH_PROG(ECHO, echo, echo) 470AC_PATH_PROG(ECHO, echo, echo)
457AC_PATH_PROG(CMP, cmp, cmp) 471AC_PATH_PROG(CMP, cmp, cmp)
458AC_PATH_PROG(TBL, tbl) 472AC_PATH_PROG(TBL, tbl)
473AC_PATH_PROG(TIC, tic)
459 474
460dnl# need a neat way to detect SVR4 or its features 475dnl# need a neat way to detect SVR4 or its features
461dnl# in src/command.c we use these functions: 476dnl# in src/command.c we use these functions:
462dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> 477dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
463dnl# - but are these also defined for other systems? 478dnl# - but are these also defined for other systems?
… …
500 sys/byteorder.h \ 515 sys/byteorder.h \
501 sys/ioctl.h \ 516 sys/ioctl.h \
502 sys/select.h \ 517 sys/select.h \
503 sys/sockio.h \ 518 sys/sockio.h \
504 sys/strredir.h \ 519 sys/strredir.h \
520 sys/stropts.h \
505 sys/time.h \ 521 sys/time.h \
506 utmp.h \ 522 utmp.h \
507 utmpx.h \ 523 utmpx.h \
508 stdint.h \ 524 stdint.h \
509) 525)
510 526
511AC_HEADER_TIME 527AC_HEADER_TIME
512 528
513dnl# check to allow both <termios.h> and <sys/ioctl.h> 529dnl# 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, 530AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
515[AC_TRY_COMPILE([#include <stdio.h> 531[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
516#include <sys/ioctl.h> 532#include <sys/ioctl.h>
517#ifdef HAVE_TERMIOS_H 533#ifdef HAVE_TERMIOS_H
518#include <termios.h> 534#include <termios.h>
519#endif], [int a = ECHO;], rxvt_cv_header_sysioctl=yes, rxvt_cv_header_sysioctl=no)]) 535#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
520 536
521dnl# ELF systems may want to store paths for dynamic libraries. 537dnl# ELF systems may want to store paths for dynamic libraries.
522dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath" 538dnl# 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. 539dnl# At least one version of SunOS wants "-R path" but it's not checked yet.
524if test -n "$GCC"; then 540if test -n "$GCC"; then
… …
533ac_save_CFLAGS=$CFLAGS 549ac_save_CFLAGS=$CFLAGS
534ac_save_LIBS=$LIBS 550ac_save_LIBS=$LIBS
535CFLAGS="$CFLAGS $X_CFLAGS" 551CFLAGS="$CFLAGS $X_CFLAGS"
536LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` 552LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
537AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath, 553AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath,
538[AC_TRY_RUN([ 554[AC_RUN_IFELSE([AC_LANG_SOURCE([[
539main() 555main()
540{ 556{
541 exit(0); 557 exit(0);
542 (void) XOpenDisplay("foobar"); 558 (void) XOpenDisplay("foobar");
543}], rxvt_cv_rpath=yes, rxvt_cv_rpath=no, dnl 559}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
544 AC_MSG_WARN([You may need to check the LIBS line]))]) 560 AC_MSG_WARN(You may need to check the LIBS line)])])
545if test x$rxvt_cv_rpath != xyes; then 561if test x$rxvt_cv_rpath != xyes; then
546 changequote(, )dnl 562 changequote(, )dnl
547 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g' 563 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
548 changequote([, ])dnl 564 changequote([, ])dnl
549 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` 565 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, 566 AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R,
551[AC_TRY_RUN([ 567[AC_RUN_IFELSE([AC_LANG_SOURCE([[
552main() 568main()
553{ 569{
554 exit(0); 570 exit(0);
555 (void) XOpenDisplay("foobar"); 571 (void) XOpenDisplay("foobar");
556}], rxvt_cv_R=yes, rxvt_cv_R=no, rxvt_cv_R=no)]) 572}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])
557 if test x$rxvt_cv_R != xyes; then 573 if test x$rxvt_cv_R != xyes; then
558 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 574 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
559 fi 575 fi
560fi 576fi
561 577
562AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 578AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
563[AC_TRY_COMPILE([#include <X11/Xlib.h>], [XPointer dummy;], 579[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 580if test x$rxvt_cv_xpointer = xyes; then
566 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 581 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
567fi 582fi
568LIBS=$ac_save_LIBS 583LIBS=$ac_save_LIBS
569CFLAGS=$ac_save_CFLAGS 584CFLAGS=$ac_save_CFLAGS
… …
582dnl> AC_CHECK_TYPE(umode_t, int) 597dnl> AC_CHECK_TYPE(umode_t, int)
583dnl> AC_CHECK_TYPE(off_t, long) 598dnl> AC_CHECK_TYPE(off_t, long)
584AC_TYPE_PID_T 599AC_TYPE_PID_T
585AC_TYPE_UID_T 600AC_TYPE_UID_T
586 601
587
588AC_CHECK_SIZEOF(char, 1)
589AC_CHECK_SIZEOF(short, 2) 602AC_CHECK_SIZEOF(short, 2)
590AC_CHECK_SIZEOF(int, 4) 603AC_CHECK_SIZEOF(int, 4)
591AC_CHECK_SIZEOF(long, 4) 604dnl AC_CHECK_SIZEOF(long, 4)
592AC_CHECK_SIZEOF(long long, 8) 605AC_CHECK_SIZEOF(long long, 8)
593AC_CHECK_SIZEOF(int *, 4) 606AC_CHECK_SIZEOF(int *, 4)
594 607
595dnl# see usage below 608dnl# see usage below
596AC_DEFUN(RXVT_CHECK_SIZE, 609AC_DEFUN(RXVT_CHECK_SIZE,
597 [AC_CACHE_CHECK([for $2], $1, 610 [AC_CACHE_CHECK([for $2], $1,
598 [AC_TRY_COMPILE([#include <stdint.h>], $2 dummy;, 611 [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 612if test $ac_cv_sizeof_char -ge $3; then
602 $1="$4 char" 613 $1="$4 char"
603else 614else
604 if test $ac_cv_sizeof_short -ge $3; then 615 if test $ac_cv_sizeof_short -ge $3; then
605 $1="$4 short" 616 $1="$4 short"
… …
707dnl# check for host field in utmp structure 718dnl# check for host field in utmp structure
708 719
709dnl# -------------------------------------------- 720dnl# --------------------------------------------
710AC_CHECK_HEADER(utmp.h, 721AC_CHECK_HEADER(utmp.h,
711[AC_CACHE_CHECK([for struct utmp], rxvt_cv_struct_utmp, 722[AC_CACHE_CHECK([for struct utmp], rxvt_cv_struct_utmp,
712[AC_TRY_COMPILE([#include <sys/types.h> 723[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
713#include <stdint.h> 724#include <stdint.h>
714#include <utmp.h>], 725#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 726if test x$rxvt_cv_struct_utmp = xyes; then
718 AC_DEFINE(HAVE_STRUCT_UTMP, 1, Define if utmp.h has struct utmp) 727 AC_DEFINE(HAVE_STRUCT_UTMP, 1, Define if utmp.h has struct utmp)
719fi 728fi
720] 729]
721 730
722AC_CACHE_CHECK(for ut_host in utmp struct, rxvt_cv_struct_utmp_host, 731AC_CACHE_CHECK(for ut_host in utmp struct, rxvt_cv_struct_utmp_host,
723[AC_TRY_COMPILE([#include <sys/types.h> 732[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
724#include <utmp.h>], 733#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 734if test x$rxvt_cv_struct_utmp_host = xyes; then
728 AC_DEFINE(HAVE_UTMP_HOST, 1, Define if struct utmp contains ut_host) 735 AC_DEFINE(HAVE_UTMP_HOST, 1, Define if struct utmp contains ut_host)
729fi 736fi
730 737
731AC_CACHE_CHECK(for ut_pid in utmp struct, rxvt_cv_struct_utmp_pid, 738AC_CACHE_CHECK(for ut_pid in utmp struct, rxvt_cv_struct_utmp_pid,
732[AC_TRY_COMPILE([#include <sys/types.h> 739[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
733#include <utmp.h>], 740#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 741if test x$rxvt_cv_struct_utmp_pid = xyes; then
737 AC_DEFINE(HAVE_UTMP_PID, 1, Define if struct utmp contains ut_pid) 742 AC_DEFINE(HAVE_UTMP_PID, 1, Define if struct utmp contains ut_pid)
738fi 743fi
739) dnl# AC_CHECK_HEADER(utmp.h 744) dnl# AC_CHECK_HEADER(utmp.h
740 745
741dnl# -------------------------------------------- 746dnl# --------------------------------------------
742 747
743AC_CHECK_HEADER(utmpx.h, 748AC_CHECK_HEADER(utmpx.h,
744[AC_CACHE_CHECK([for struct utmpx], rxvt_cv_struct_utmpx, 749[AC_CACHE_CHECK([for struct utmpx], rxvt_cv_struct_utmpx,
745[AC_TRY_COMPILE([#include <sys/types.h> 750[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
746#include <utmpx.h>], 751#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 752if test x$rxvt_cv_struct_utmpx = xyes; then
750 AC_DEFINE(HAVE_STRUCT_UTMPX, 1, Define if utmpx.h has struct utmpx) 753 AC_DEFINE(HAVE_STRUCT_UTMPX, 1, Define if utmpx.h has struct utmpx)
751fi 754fi
752] 755]
753 756
754AC_CACHE_CHECK(for host in utmpx struct, rxvt_cv_struct_utmpx_host, 757AC_CACHE_CHECK(for host in utmpx struct, rxvt_cv_struct_utmpx_host,
755[AC_TRY_COMPILE([#include <sys/types.h> 758[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
756#include <utmpx.h>], 759#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 760if test x$rxvt_cv_struct_utmpx_host = xyes; then
760 AC_DEFINE(HAVE_UTMPX_HOST, 1, Define if struct utmpx contains ut_host) 761 AC_DEFINE(HAVE_UTMPX_HOST, 1, Define if struct utmpx contains ut_host)
761fi 762fi
762) dnl# AC_CHECK_HEADER(utmpx.h 763) dnl# AC_CHECK_HEADER(utmpx.h
763 764
764 765
765dnl# -------------------------------------------------------------------------- 766dnl# --------------------------------------------------------------------------
766dnl# check for struct lastlog 767dnl# check for struct lastlog
767AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog, 768AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog,
768[AC_TRY_COMPILE([#include <sys/types.h> 769[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
769#include <utmp.h> 770#include <utmp.h>
770#ifdef HAVE_LASTLOG_H 771#ifdef HAVE_LASTLOG_H
771#include <lastlog.h> 772#include <lastlog.h>
772#endif 773#endif
773],
774[struct lastlog ll;],
775rxvt_cv_struct_lastlog=yes, rxvt_cv_struct_lastlog=no)]) 774]], [[struct lastlog ll;]])],[rxvt_cv_struct_lastlog=yes],[rxvt_cv_struct_lastlog=no])])
776if test x$rxvt_cv_struct_lastlog = xyes; then 775if 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) 776 AC_DEFINE(HAVE_STRUCT_LASTLOG, 1, Define if utmp.h or lastlog.h has struct lastlog)
778fi 777fi
779 778
780dnl# check for struct lastlogx 779dnl# check for struct lastlogx
781AC_CACHE_CHECK(for struct lastlogx, rxvt_cv_struct_lastlogx, 780AC_CACHE_CHECK(for struct lastlogx, rxvt_cv_struct_lastlogx,
782[AC_TRY_COMPILE([#include <sys/types.h> 781[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
783#include <utmpx.h> 782#include <utmpx.h>
784#ifdef HAVE_LASTLOG_H 783#ifdef HAVE_LASTLOG_H
785#include <lastlog.h> 784#include <lastlog.h>
786#endif 785#endif
787],
788[struct lastlogx ll;],
789rxvt_cv_struct_lastlogx=yes, rxvt_cv_struct_lastlogx=no)]) 786]], [[struct lastlogx ll;]])],[rxvt_cv_struct_lastlogx=yes],[rxvt_cv_struct_lastlogx=no])])
790if test x$rxvt_cv_struct_lastlogx = xyes; then 787if 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) 788 AC_DEFINE(HAVE_STRUCT_LASTLOGX, 1, Define if utmpx.h or lastlog.h has struct lastlogx)
792fi 789fi
793 790
794dnl# -------------------------------------------------------------------------- 791dnl# --------------------------------------------------------------------------
795dnl# FIND FILES 792dnl# FIND FILES
796dnl# -------------------------------------------------------------------------- 793dnl# --------------------------------------------------------------------------
797 794
798dnl# find utmp 795dnl# find utmp
799AC_CACHE_CHECK(where utmp is located, rxvt_cv_path_utmp, 796AC_CACHE_CHECK(where utmp is located, rxvt_cv_path_utmp,
800[AC_TRY_RUN([#include <stdio.h> 797[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
801#include <sys/types.h> 798#include <sys/types.h>
802#include <utmp.h> 799#include <utmp.h>
803#include <errno.h> 800#include <errno.h>
804main() 801main()
805{ 802{
… …
820 fprintf(f, "%s\n", *u); 817 fprintf(f, "%s\n", *u);
821 exit(0); 818 exit(0);
822 } 819 }
823 } 820 }
824 exit(0); 821 exit(0);
825}], rxvt_cv_path_utmp=`cat conftestval`, rxvt_cv_path_utmp=, dnl 822}]])],[rxvt_cv_path_utmp=`cat conftestval`],[rxvt_cv_path_utmp=],[dnl
826 AC_MSG_WARN([Define RXVT_UTMP_FILE in config.h manually]))]) 823 AC_MSG_WARN(Define RXVT_UTMP_FILE in config.h manually)])])
827if test x$rxvt_cv_path_utmp != x; then 824if test x$rxvt_cv_path_utmp != x; then
828 AC_DEFINE_UNQUOTED(RXVT_UTMP_FILE, "$rxvt_cv_path_utmp", Define location of utmp) 825 AC_DEFINE_UNQUOTED(RXVT_UTMP_FILE, "$rxvt_cv_path_utmp", Define location of utmp)
829fi 826fi
830 827
831dnl# -------------------------------------------------------------------------- 828dnl# --------------------------------------------------------------------------
832 829
833dnl# find utmpx - if a utmp file exists at the same location and is more than 830dnl# 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. 831dnl# a day newer, then dump the utmpx. People leave lots of junk around.
835AC_CACHE_CHECK(where utmpx is located, rxvt_cv_path_utmpx, 832AC_CACHE_CHECK(where utmpx is located, rxvt_cv_path_utmpx,
836[AC_TRY_RUN([#include <stdio.h> 833[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
837#include <sys/types.h> 834#include <sys/types.h>
838#include <utmpx.h> 835#include <utmpx.h>
839#include <errno.h> 836#include <errno.h>
840#include <sys/stat.h> 837#include <sys/stat.h>
841#ifdef HAVE_STRING_H 838#ifdef HAVE_STRING_H
… …
866 fprintf(f, "%s\n", *u); 863 fprintf(f, "%s\n", *u);
867 exit(0); 864 exit(0);
868 } 865 }
869 } 866 }
870 exit(0); 867 exit(0);
871}], rxvt_cv_path_utmpx=`cat conftestval`, rxvt_cv_path_utmpx=, dnl 868}]])],[rxvt_cv_path_utmpx=`cat conftestval`],[rxvt_cv_path_utmpx=],[dnl
872 AC_MSG_WARN([Define RXVT_UTMPX_FILE in config.h manually]))]) 869 AC_MSG_WARN(Define RXVT_UTMPX_FILE in config.h manually)])])
873if test x$rxvt_cv_path_utmpx != x; then 870if test x$rxvt_cv_path_utmpx != x; then
874 AC_DEFINE_UNQUOTED(RXVT_UTMPX_FILE, "$rxvt_cv_path_utmpx", Define location of utmpx) 871 AC_DEFINE_UNQUOTED(RXVT_UTMPX_FILE, "$rxvt_cv_path_utmpx", Define location of utmpx)
875fi 872fi
876 873
877dnl# -------------------------------------------------------------------------- 874dnl# --------------------------------------------------------------------------
878 875
879dnl# find wtmp 876dnl# find wtmp
880AC_CACHE_CHECK(where wtmp is located, rxvt_cv_path_wtmp, 877AC_CACHE_CHECK(where wtmp is located, rxvt_cv_path_wtmp,
881[AC_TRY_RUN([#include <stdio.h> 878[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
882#include <sys/types.h> 879#include <sys/types.h>
883#ifdef HAVE_UTMP_H 880#ifdef HAVE_UTMP_H
884#include <utmp.h> 881#include <utmp.h>
885#endif 882#endif
886#include <errno.h> 883#include <errno.h>
… …
903 fprintf(f, "%s\n", *w); 900 fprintf(f, "%s\n", *w);
904 exit(0); 901 exit(0);
905 } 902 }
906 } 903 }
907 exit(0); 904 exit(0);
908}], rxvt_cv_path_wtmp=`cat conftestval`, rxvt_cv_path_wtmp=, dnl 905}]])],[rxvt_cv_path_wtmp=`cat conftestval`],[rxvt_cv_path_wtmp=],[dnl
909 AC_MSG_WARN([Define RXVT_WTMP_FILE in config.h manually]))]) 906 AC_MSG_WARN(Define RXVT_WTMP_FILE in config.h manually)])])
910if test x$rxvt_cv_path_wtmp != x; then 907if test x$rxvt_cv_path_wtmp != x; then
911 AC_DEFINE_UNQUOTED(RXVT_WTMP_FILE, "$rxvt_cv_path_wtmp", Define location of wtmp) 908 AC_DEFINE_UNQUOTED(RXVT_WTMP_FILE, "$rxvt_cv_path_wtmp", Define location of wtmp)
912fi 909fi
913dnl# -------------------------------------------------------------------------- 910dnl# --------------------------------------------------------------------------
914 911
915dnl# find wtmpx 912dnl# find wtmpx
916AC_CACHE_CHECK(where wtmpx is located, rxvt_cv_path_wtmpx, 913AC_CACHE_CHECK(where wtmpx is located, rxvt_cv_path_wtmpx,
917[AC_TRY_RUN([#include <stdio.h> 914[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
918#ifdef HAVE_UTMPX_H 915#ifdef HAVE_UTMPX_H
919#include <utmpx.h> 916#include <utmpx.h>
920#endif 917#endif
921#include <errno.h> 918#include <errno.h>
922main() 919main()
… …
938 fprintf(f, "%s\n", *w); 935 fprintf(f, "%s\n", *w);
939 exit(0); 936 exit(0);
940 } 937 }
941 } 938 }
942 exit(0); 939 exit(0);
943}], rxvt_cv_path_wtmpx=`cat conftestval`, rxvt_cv_path_wtmpx=, dnl 940}]])],[rxvt_cv_path_wtmpx=`cat conftestval`],[rxvt_cv_path_wtmpx=],[dnl
944 AC_MSG_WARN([Define RXVT_WTMPX_FILE in config.h manually]))]) 941 AC_MSG_WARN(Define RXVT_WTMPX_FILE in config.h manually)])])
945if test x$rxvt_cv_path_wtmpx != x; then 942if test x$rxvt_cv_path_wtmpx != x; then
946 AC_DEFINE_UNQUOTED(RXVT_WTMPX_FILE, "$rxvt_cv_path_wtmpx", Define location of wtmpx) 943 AC_DEFINE_UNQUOTED(RXVT_WTMPX_FILE, "$rxvt_cv_path_wtmpx", Define location of wtmpx)
947fi 944fi
948dnl# -------------------------------------------------------------------------- 945dnl# --------------------------------------------------------------------------
949 946
950dnl# find lastlog 947dnl# find lastlog
951AC_CACHE_CHECK(where lastlog is located, rxvt_cv_path_lastlog, 948AC_CACHE_CHECK(where lastlog is located, rxvt_cv_path_lastlog,
952[AC_TRY_RUN([#include <stdio.h> 949[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
953#include <sys/types.h> 950#include <sys/types.h>
954#ifdef HAVE_UTMPX_H 951#ifdef HAVE_UTMPX_H
955#include <utmpx.h> 952#include <utmpx.h>
956#elif defined(HAVE_UTMP_H) 953#elif defined(HAVE_UTMP_H)
957#include <utmp.h> 954#include <utmp.h>
… …
978 fprintf(f, "%s\n", *w); 975 fprintf(f, "%s\n", *w);
979 exit(0); 976 exit(0);
980 } 977 }
981 } 978 }
982 exit(0); 979 exit(0);
983}], rxvt_cv_path_lastlog=`cat conftestval`, rxvt_cv_path_lastlog=, dnl 980}]])],[rxvt_cv_path_lastlog=`cat conftestval`],[rxvt_cv_path_lastlog=],[dnl
984 AC_MSG_WARN([Define RXVT_LASTLOG_FILE in config.h manually]))]) 981 AC_MSG_WARN(Define RXVT_LASTLOG_FILE in config.h manually)])])
985if test x$rxvt_cv_path_lastlog != x; then 982if test x$rxvt_cv_path_lastlog != x; then
986 AC_DEFINE_UNQUOTED(RXVT_LASTLOG_FILE, "$rxvt_cv_path_lastlog", Define location of lastlog) 983 AC_DEFINE_UNQUOTED(RXVT_LASTLOG_FILE, "$rxvt_cv_path_lastlog", Define location of lastlog)
987 if test -d "$rxvt_cv_path_lastlog"; then 984 if test -d "$rxvt_cv_path_lastlog"; then
988 AC_DEFINE(LASTLOG_IS_DIR, 1, Define if lastlog is provided via a directory) 985 AC_DEFINE(LASTLOG_IS_DIR, 1, Define if lastlog is provided via a directory)
989 fi 986 fi
990fi 987fi
991dnl# -------------------------------------------------------------------------- 988dnl# --------------------------------------------------------------------------
992 989
993dnl# find lastlogx 990dnl# find lastlogx
994AC_CACHE_CHECK(where lastlogx is located, rxvt_cv_path_lastlogx, 991AC_CACHE_CHECK(where lastlogx is located, rxvt_cv_path_lastlogx,
995[AC_TRY_RUN([#include <stdio.h> 992[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
996#ifdef HAVE_UTMPX_H 993#ifdef HAVE_UTMPX_H
997#include <utmpx.h> 994#include <utmpx.h>
998#endif 995#endif
999#include <errno.h> 996#include <errno.h>
1000main() 997main()
… …
1015 fprintf(f, "%s\n", *w); 1012 fprintf(f, "%s\n", *w);
1016 exit(0); 1013 exit(0);
1017 } 1014 }
1018 } 1015 }
1019 exit(0); 1016 exit(0);
1020}], rxvt_cv_path_lastlogx=`cat conftestval`, rxvt_cv_path_lastlogx=, dnl 1017}]])],[rxvt_cv_path_lastlogx=`cat conftestval`],[rxvt_cv_path_lastlogx=],[dnl
1021 AC_MSG_WARN([Define RXVT_LASTLOGX_FILE in config.h manually]))]) 1018 AC_MSG_WARN(Define RXVT_LASTLOGX_FILE in config.h manually)])])
1022if test x$rxvt_cv_path_lastlogx != x; then 1019if test x$rxvt_cv_path_lastlogx != x; then
1023 AC_DEFINE_UNQUOTED(RXVT_LASTLOGX_FILE, "$rxvt_cv_path_lastlogx", Define location of lastlogx) 1020 AC_DEFINE_UNQUOTED(RXVT_LASTLOGX_FILE, "$rxvt_cv_path_lastlogx", Define location of lastlogx)
1024fi 1021fi
1025 1022
1026dnl# -------------------------------------------------------------------------- 1023dnl# --------------------------------------------------------------------------
… …
1050LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 1047LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
1051if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then 1048if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
1052 LIBS=`echo $LIBS | sed "$R_TRANSLATE"` 1049 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
1053fi 1050fi
1054AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 1051AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
1055[AC_TRY_RUN([#include <X11/Xlib.h> 1052[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
1056main() { 1053main() {
1057char *p; 1054char *p;
1058if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 1055if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
1059exit (XSupportsLocale() ? 0 : 1); 1056exit (XSupportsLocale() ? 0 : 1);
1060else 1057else
1061exit (1);}], dnl 1058exit (1);}]])],[dnl
1062 rxvt_cv_func_xlocale=yes, rxvt_cv_func_xlocale=no, dnl 1059 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
1063 AC_MSG_WARN([Define NO_XLOCALE in config.h manually]))]) 1060 AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])])
1064if test x$rxvt_cv_func_xlocale = xyes; then 1061if test x$rxvt_cv_func_xlocale = xyes; then
1065 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works) 1062 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works)
1066fi 1063fi
1067 1064
1068AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, 1065AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
1069[AC_TRY_LINK([#define X_LOCALE 1 1066[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
1070#include <X11/Xlocale.h>], 1067#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 1068if test x$rxvt_cv_func_xsetlocale = xyes; then
1074 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 1069 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
1075fi 1070fi
1076LIBS=$ac_save_LIBS 1071LIBS=$ac_save_LIBS
1077CFLAGS=$ac_save_CFLAGS 1072CFLAGS=$ac_save_CFLAGS
1078 1073
1079AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale, 1074AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
1080[AC_TRY_LINK([#include <clocale>], 1075[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 1076if test x$rxvt_cv_func_setlocale = xyes; then
1084 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works) 1077 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
1085fi 1078fi
1086 1079
1087AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo, 1080AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,
1088[AC_TRY_LINK([#include <langinfo.h>], 1081[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 1082if test x$rxvt_cv_func_nl_langinfo = xyes; then
1092 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) 1083 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
1093fi 1084fi
1094 1085
1095AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb, 1086AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
… …
1107if test x$rxvt_broken_ximcb = xyes; then 1098if test x$rxvt_broken_ximcb = xyes; then
1108 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.) 1099 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
1109fi 1100fi
1110 1101
1111AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt, 1102AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt,
1112[AC_TRY_LINK([#define _GNU_SOURCE 1103[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define _GNU_SOURCE
1113#ifdef HAVE_STDLIB_H 1104#ifdef HAVE_STDLIB_H
1114# include <cstdlib> 1105# include <cstdlib>
1115#endif], 1106#endif]], [[(void)getpt();]])],[rxvt_cv_func_getpt=yes],[rxvt_cv_func_getpt=no])])
1116 [(void)getpt();],
1117 rxvt_cv_func_getpt=yes, rxvt_cv_func_getpt=no)])
1118if test x$rxvt_cv_func_getpt = xyes; then 1107if test x$rxvt_cv_func_getpt = xyes; then
1119 AC_DEFINE(HAVE_GETPT, 1, Define if you have _GNU_SOURCE getpt() ) 1108 AC_DEFINE(HAVE_GETPT, 1, Define if you have _GNU_SOURCE getpt() )
1120fi 1109fi
1121 1110
1122dnl# if we don't guess right then it's up to the user 1111dnl# if we don't guess right then it's up to the user
… …
1180if test x$rxvt_cv_ptys = xBSD -o x$rxvt_cv_ptys = xHPUX -o x$rxvt_cv_ptys = xGLIBC; then 1169if test x$rxvt_cv_ptys = xBSD -o x$rxvt_cv_ptys = xHPUX -o x$rxvt_cv_ptys = xGLIBC; then
1181 AC_DEFINE(PTYS_ARE_SEARCHED, 1, Define for this pty type) 1170 AC_DEFINE(PTYS_ARE_SEARCHED, 1, Define for this pty type)
1182fi 1171fi
1183 1172
1184 1173
1185AC_CHECKING(for pty ranges) 1174AS_MESSAGE(checking for pty ranges...)
1186ptys=`echo /dev/pty??` 1175ptys=`echo /dev/pty??`
1187pch1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'` 1176pch1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'`
1188pch2=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'` 1177pch2=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'`
1189if test x$pch1 != x; then 1178if test x$pch1 != x; then
1190 AC_DEFINE_UNQUOTED(PTYCHAR1, "$pch1", Define for first char in devptyXX) 1179 AC_DEFINE_UNQUOTED(PTYCHAR1, "$pch1", Define for first char in devptyXX)
… …
1194fi 1183fi
1195 1184
1196dnl# -------------------------------------------------------------------------- 1185dnl# --------------------------------------------------------------------------
1197dnl# now add and remove other stuff 1186dnl# now add and remove other stuff
1198dnl# -------------------------------------------------------------------------- 1187dnl# --------------------------------------------------------------------------
1188if test x$support_xft = xyes; then
1189 LIBS="$LIBS `pkg-config xft --libs`"
1190 CFLAGS="$CFLAGS `pkg-config xft --cflags`"
1191 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
1192
1193 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
1194 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
1195
1196 if test x$support_xft = xyes; then
1197 AC_DEFINE(XFT, 1, Define to enable xft support)
1198 fi
1199fi
1200if test x$support_styles = xyes; then
1201 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
1202fi
1203if test x$support_iso14755 = xyes; then
1204 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
1205fi
1199if test x$support_8bitctrls = xyes; then 1206if test x$support_8bitctrls = xyes; then
1200 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences) 1207 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
1201fi 1208fi
1202if test x$support_fading = xyes; then 1209if test x$support_fading = xyes; then
1203 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) 1210 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
… …
1215 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen) 1222 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)
1216fi 1223fi
1217if test x$support_menubar = xyes; then 1224if test x$support_menubar = xyes; then
1218 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support) 1225 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support)
1219fi 1226fi
1220if test x$support_frills = xno; then 1227if test x$support_frills = xyes; then
1221 AC_DEFINE(NO_FRILLS, 1, Define if you don't want handling for rarely used features) 1228 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
1222fi
1223if test x$support_linespace = xno; then
1224 AC_DEFINE(NO_LINESPACE, 1, Define if you don't want support linespace)
1225fi 1229fi
1226if test x$support_24bit = xyes; then 1230if test x$support_24bit = xyes; then
1227 AC_DEFINE(PREFER_24BIT, 1, Define to use a 24 bit visual if the screen has 24 bit mode, even if the default is 8 bit) 1231 AC_DEFINE(PREFER_24BIT, 1, Define to use a 24 bit visual if the screen has 24 bit mode, even if the default is 8 bit)
1228fi 1232fi
1229if test x$support_mousewheel = xyes; then 1233if test x$support_mousewheel = xyes; then
… …
1279fi 1283fi
1280if test x$support_combining = xyes; then 1284if test x$support_combining = xyes; then
1281 AC_DEFINE(ENABLE_COMBINING, 1, Define if you want to automatically compose combining characters) 1285 AC_DEFINE(ENABLE_COMBINING, 1, Define if you want to automatically compose combining characters)
1282fi 1286fi
1283if test x$codesets = xall; then 1287if test x$codesets = xall; then
1284 codesets=jp,jp-ext,kr,cn,cn-ext 1288 codesets=jp,jp-ext,kr,zh,zh-ext
1285fi 1289fi
1290AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
1291AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
1286for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do 1292for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do
1287 AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
1288 AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
1289 case "$codeset" in 1293 case "$codeset" in
1290 JP ) AC_DEFINE(ENCODING_JP, 1, Define if you want japanese codesets) ;; 1294 JP ) AC_DEFINE(ENCODING_JP, 1, Define if you want japanese codesets) ;;
1291 JP_EXT ) AC_DEFINE(ENCODING_JP_EXT, 1, Define if you want extended japanese codesets) ;; 1295 JP_EXT ) AC_DEFINE(ENCODING_JP_EXT, 1, Define if you want extended japanese codesets) ;;
1292 KR ) AC_DEFINE(ENCODING_KR, 1, Define if you want korean codesets) ;; 1296 KR ) AC_DEFINE(ENCODING_KR, 1, Define if you want korean codesets) ;;
1293 CN ) AC_DEFINE(ENCODING_CN, 1, Define if you want chinese codesets) ;; 1297 ZH ) AC_DEFINE(ENCODING_ZH, 1, Define if you want chinese codesets) ;;
1294 CN_EXT ) AC_DEFINE(ENCODING_CN_EXT, 1, Define if you want extended chinese codesets) ;; 1298 ZH_EXT ) AC_DEFINE(ENCODING_ZH_EXT, 1, Define if you want extended chinese codesets) ;;
1295 esac 1299 esac
1296done 1300done
1297 1301
1298dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket) 1302dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket)
1299 1303
… …
1354RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch) 1358RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch)
1355RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch) 1359RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
1356RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch) 1360RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)
1357RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes) 1361RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
1358 1362
1359if test x$support_xft = xyes; then
1360 LIBS="$LIBS `pkg-config xft --libs`"
1361 CFLAGS="$CFLAGS `pkg-config xft --cflags`"
1362 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
1363
1364 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
1365 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
1366
1367 if test x$support_xft = xyes; then
1368 AC_DEFINE(XFT, 1, Define to enable xft support)
1369 fi
1370fi
1371
1372AC_OUTPUT(autoconf/Make.common \ 1363AC_CONFIG_FILES([autoconf/Make.common \
1373Makefile \ 1364Makefile \
1374doc/Makefile \ 1365doc/Makefile \
1375src/Makefile \ 1366src/Makefile \
1376src/test/Makefile \ 1367src/test/Makefile \
1377src/rxvtlib.h \ 1368src/rxvtlib.h \
1378W11/Makefile \ 1369W11/Makefile \
1379) 1370])
1371AC_OUTPUT
1380 1372
1381echo "Configuration: 1373echo "Configuration:
1382 1374
1383 Rxvt version: $VERSION : $DATE 1375 Rxvt version: $VERSION : $DATE
1384 Source code location: $srcdir 1376 Source code location: $srcdir

Diff Legend

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