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.45 by root, Tue Jan 11 04:44: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 \
525 pty.h \
509) 526)
510 527
511AC_HEADER_TIME 528AC_HEADER_TIME
512 529
513dnl# check to allow both <termios.h> and <sys/ioctl.h> 530dnl# 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, 531AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
515[AC_TRY_COMPILE([#include <stdio.h> 532[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
516#include <sys/ioctl.h> 533#include <sys/ioctl.h>
517#ifdef HAVE_TERMIOS_H 534#ifdef HAVE_TERMIOS_H
518#include <termios.h> 535#include <termios.h>
519#endif], [int a = ECHO;], rxvt_cv_header_sysioctl=yes, rxvt_cv_header_sysioctl=no)]) 536#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
520 537
521dnl# ELF systems may want to store paths for dynamic libraries. 538dnl# ELF systems may want to store paths for dynamic libraries.
522dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath" 539dnl# 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. 540dnl# At least one version of SunOS wants "-R path" but it's not checked yet.
524if test -n "$GCC"; then 541if test -n "$GCC"; then
… …
533ac_save_CFLAGS=$CFLAGS 550ac_save_CFLAGS=$CFLAGS
534ac_save_LIBS=$LIBS 551ac_save_LIBS=$LIBS
535CFLAGS="$CFLAGS $X_CFLAGS" 552CFLAGS="$CFLAGS $X_CFLAGS"
536LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` 553LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
537AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath, 554AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath,
538[AC_TRY_RUN([ 555[AC_RUN_IFELSE([AC_LANG_SOURCE([[
539main() 556main()
540{ 557{
541 exit(0); 558 exit(0);
542 (void) XOpenDisplay("foobar"); 559 (void) XOpenDisplay("foobar");
543}], rxvt_cv_rpath=yes, rxvt_cv_rpath=no, dnl 560}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
544 AC_MSG_WARN([You may need to check the LIBS line]))]) 561 AC_MSG_WARN(You may need to check the LIBS line)])])
545if test x$rxvt_cv_rpath != xyes; then 562if test x$rxvt_cv_rpath != xyes; then
546 changequote(, )dnl 563 changequote(, )dnl
547 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g' 564 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
548 changequote([, ])dnl 565 changequote([, ])dnl
549 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` 566 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, 567 AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R,
551[AC_TRY_RUN([ 568[AC_RUN_IFELSE([AC_LANG_SOURCE([[
552main() 569main()
553{ 570{
554 exit(0); 571 exit(0);
555 (void) XOpenDisplay("foobar"); 572 (void) XOpenDisplay("foobar");
556}], rxvt_cv_R=yes, rxvt_cv_R=no, rxvt_cv_R=no)]) 573}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])
557 if test x$rxvt_cv_R != xyes; then 574 if test x$rxvt_cv_R != xyes; then
558 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 575 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
559 fi 576 fi
560fi 577fi
561 578
562AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 579AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
563[AC_TRY_COMPILE([#include <X11/Xlib.h>], [XPointer dummy;], 580[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 581if test x$rxvt_cv_xpointer = xyes; then
566 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 582 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
567fi 583fi
568LIBS=$ac_save_LIBS 584LIBS=$ac_save_LIBS
569CFLAGS=$ac_save_CFLAGS 585CFLAGS=$ac_save_CFLAGS
… …
582dnl> AC_CHECK_TYPE(umode_t, int) 598dnl> AC_CHECK_TYPE(umode_t, int)
583dnl> AC_CHECK_TYPE(off_t, long) 599dnl> AC_CHECK_TYPE(off_t, long)
584AC_TYPE_PID_T 600AC_TYPE_PID_T
585AC_TYPE_UID_T 601AC_TYPE_UID_T
586 602
587
588AC_CHECK_SIZEOF(char, 1)
589AC_CHECK_SIZEOF(short, 2) 603AC_CHECK_SIZEOF(short, 2)
590AC_CHECK_SIZEOF(int, 4) 604AC_CHECK_SIZEOF(int, 4)
591AC_CHECK_SIZEOF(long, 4) 605dnl AC_CHECK_SIZEOF(long, 4)
592AC_CHECK_SIZEOF(long long, 8) 606AC_CHECK_SIZEOF(long long, 8)
593AC_CHECK_SIZEOF(int *, 4) 607AC_CHECK_SIZEOF(int *, 4)
594 608
595dnl# see usage below 609dnl# see usage below
596AC_DEFUN(RXVT_CHECK_SIZE, 610AC_DEFUN(RXVT_CHECK_SIZE,
597 [AC_CACHE_CHECK([for $2], $1, 611 [AC_CACHE_CHECK([for $2], $1,
598 [AC_TRY_COMPILE([#include <stdint.h>], $2 dummy;, 612 [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 613if test $ac_cv_sizeof_char -ge $3; then
602 $1="$4 char" 614 $1="$4 char"
603else 615else
604 if test $ac_cv_sizeof_short -ge $3; then 616 if test $ac_cv_sizeof_short -ge $3; then
605 $1="$4 short" 617 $1="$4 short"
… …
707dnl# check for host field in utmp structure 719dnl# check for host field in utmp structure
708 720
709dnl# -------------------------------------------- 721dnl# --------------------------------------------
710AC_CHECK_HEADER(utmp.h, 722AC_CHECK_HEADER(utmp.h,
711[AC_CACHE_CHECK([for struct utmp], rxvt_cv_struct_utmp, 723[AC_CACHE_CHECK([for struct utmp], rxvt_cv_struct_utmp,
712[AC_TRY_COMPILE([#include <sys/types.h> 724[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
713#include <stdint.h> 725#include <stdint.h>
714#include <utmp.h>], 726#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 727if test x$rxvt_cv_struct_utmp = xyes; then
718 AC_DEFINE(HAVE_STRUCT_UTMP, 1, Define if utmp.h has struct utmp) 728 AC_DEFINE(HAVE_STRUCT_UTMP, 1, Define if utmp.h has struct utmp)
719fi 729fi
720] 730]
721 731
722AC_CACHE_CHECK(for ut_host in utmp struct, rxvt_cv_struct_utmp_host, 732AC_CACHE_CHECK(for ut_host in utmp struct, rxvt_cv_struct_utmp_host,
723[AC_TRY_COMPILE([#include <sys/types.h> 733[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
724#include <utmp.h>], 734#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 735if test x$rxvt_cv_struct_utmp_host = xyes; then
728 AC_DEFINE(HAVE_UTMP_HOST, 1, Define if struct utmp contains ut_host) 736 AC_DEFINE(HAVE_UTMP_HOST, 1, Define if struct utmp contains ut_host)
729fi 737fi
730 738
731AC_CACHE_CHECK(for ut_pid in utmp struct, rxvt_cv_struct_utmp_pid, 739AC_CACHE_CHECK(for ut_pid in utmp struct, rxvt_cv_struct_utmp_pid,
732[AC_TRY_COMPILE([#include <sys/types.h> 740[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
733#include <utmp.h>], 741#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 742if test x$rxvt_cv_struct_utmp_pid = xyes; then
737 AC_DEFINE(HAVE_UTMP_PID, 1, Define if struct utmp contains ut_pid) 743 AC_DEFINE(HAVE_UTMP_PID, 1, Define if struct utmp contains ut_pid)
738fi 744fi
739) dnl# AC_CHECK_HEADER(utmp.h 745) dnl# AC_CHECK_HEADER(utmp.h
740 746
741dnl# -------------------------------------------- 747dnl# --------------------------------------------
742 748
743AC_CHECK_HEADER(utmpx.h, 749AC_CHECK_HEADER(utmpx.h,
744[AC_CACHE_CHECK([for struct utmpx], rxvt_cv_struct_utmpx, 750[AC_CACHE_CHECK([for struct utmpx], rxvt_cv_struct_utmpx,
745[AC_TRY_COMPILE([#include <sys/types.h> 751[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
746#include <utmpx.h>], 752#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 753if test x$rxvt_cv_struct_utmpx = xyes; then
750 AC_DEFINE(HAVE_STRUCT_UTMPX, 1, Define if utmpx.h has struct utmpx) 754 AC_DEFINE(HAVE_STRUCT_UTMPX, 1, Define if utmpx.h has struct utmpx)
751fi 755fi
752] 756]
753 757
754AC_CACHE_CHECK(for host in utmpx struct, rxvt_cv_struct_utmpx_host, 758AC_CACHE_CHECK(for host in utmpx struct, rxvt_cv_struct_utmpx_host,
755[AC_TRY_COMPILE([#include <sys/types.h> 759[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
756#include <utmpx.h>], 760#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 761if test x$rxvt_cv_struct_utmpx_host = xyes; then
760 AC_DEFINE(HAVE_UTMPX_HOST, 1, Define if struct utmpx contains ut_host) 762 AC_DEFINE(HAVE_UTMPX_HOST, 1, Define if struct utmpx contains ut_host)
761fi 763fi
762) dnl# AC_CHECK_HEADER(utmpx.h 764) dnl# AC_CHECK_HEADER(utmpx.h
763 765
764 766
765dnl# -------------------------------------------------------------------------- 767dnl# --------------------------------------------------------------------------
766dnl# check for struct lastlog 768dnl# check for struct lastlog
767AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog, 769AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog,
768[AC_TRY_COMPILE([#include <sys/types.h> 770[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
769#include <utmp.h> 771#include <utmp.h>
770#ifdef HAVE_LASTLOG_H 772#ifdef HAVE_LASTLOG_H
771#include <lastlog.h> 773#include <lastlog.h>
772#endif 774#endif
773],
774[struct lastlog ll;],
775rxvt_cv_struct_lastlog=yes, rxvt_cv_struct_lastlog=no)]) 775]], [[struct lastlog ll;]])],[rxvt_cv_struct_lastlog=yes],[rxvt_cv_struct_lastlog=no])])
776if test x$rxvt_cv_struct_lastlog = xyes; then 776if 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) 777 AC_DEFINE(HAVE_STRUCT_LASTLOG, 1, Define if utmp.h or lastlog.h has struct lastlog)
778fi 778fi
779 779
780dnl# check for struct lastlogx 780dnl# check for struct lastlogx
781AC_CACHE_CHECK(for struct lastlogx, rxvt_cv_struct_lastlogx, 781AC_CACHE_CHECK(for struct lastlogx, rxvt_cv_struct_lastlogx,
782[AC_TRY_COMPILE([#include <sys/types.h> 782[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
783#include <utmpx.h> 783#include <utmpx.h>
784#ifdef HAVE_LASTLOG_H 784#ifdef HAVE_LASTLOG_H
785#include <lastlog.h> 785#include <lastlog.h>
786#endif 786#endif
787],
788[struct lastlogx ll;],
789rxvt_cv_struct_lastlogx=yes, rxvt_cv_struct_lastlogx=no)]) 787]], [[struct lastlogx ll;]])],[rxvt_cv_struct_lastlogx=yes],[rxvt_cv_struct_lastlogx=no])])
790if test x$rxvt_cv_struct_lastlogx = xyes; then 788if 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) 789 AC_DEFINE(HAVE_STRUCT_LASTLOGX, 1, Define if utmpx.h or lastlog.h has struct lastlogx)
792fi 790fi
793 791
794dnl# -------------------------------------------------------------------------- 792dnl# --------------------------------------------------------------------------
795dnl# FIND FILES 793dnl# FIND FILES
796dnl# -------------------------------------------------------------------------- 794dnl# --------------------------------------------------------------------------
797 795
798dnl# find utmp 796dnl# find utmp
799AC_CACHE_CHECK(where utmp is located, rxvt_cv_path_utmp, 797AC_CACHE_CHECK(where utmp is located, rxvt_cv_path_utmp,
800[AC_TRY_RUN([#include <stdio.h> 798[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
801#include <sys/types.h> 799#include <sys/types.h>
802#include <utmp.h> 800#include <utmp.h>
803#include <errno.h> 801#include <errno.h>
804main() 802main()
805{ 803{
… …
820 fprintf(f, "%s\n", *u); 818 fprintf(f, "%s\n", *u);
821 exit(0); 819 exit(0);
822 } 820 }
823 } 821 }
824 exit(0); 822 exit(0);
825}], rxvt_cv_path_utmp=`cat conftestval`, rxvt_cv_path_utmp=, dnl 823}]])],[rxvt_cv_path_utmp=`cat conftestval`],[rxvt_cv_path_utmp=],[dnl
826 AC_MSG_WARN([Define RXVT_UTMP_FILE in config.h manually]))]) 824 AC_MSG_WARN(Define RXVT_UTMP_FILE in config.h manually)])])
827if test x$rxvt_cv_path_utmp != x; then 825if test x$rxvt_cv_path_utmp != x; then
828 AC_DEFINE_UNQUOTED(RXVT_UTMP_FILE, "$rxvt_cv_path_utmp", Define location of utmp) 826 AC_DEFINE_UNQUOTED(RXVT_UTMP_FILE, "$rxvt_cv_path_utmp", Define location of utmp)
829fi 827fi
830 828
831dnl# -------------------------------------------------------------------------- 829dnl# --------------------------------------------------------------------------
832 830
833dnl# find utmpx - if a utmp file exists at the same location and is more than 831dnl# 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. 832dnl# a day newer, then dump the utmpx. People leave lots of junk around.
835AC_CACHE_CHECK(where utmpx is located, rxvt_cv_path_utmpx, 833AC_CACHE_CHECK(where utmpx is located, rxvt_cv_path_utmpx,
836[AC_TRY_RUN([#include <stdio.h> 834[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
837#include <sys/types.h> 835#include <sys/types.h>
838#include <utmpx.h> 836#include <utmpx.h>
839#include <errno.h> 837#include <errno.h>
840#include <sys/stat.h> 838#include <sys/stat.h>
841#ifdef HAVE_STRING_H 839#ifdef HAVE_STRING_H
… …
866 fprintf(f, "%s\n", *u); 864 fprintf(f, "%s\n", *u);
867 exit(0); 865 exit(0);
868 } 866 }
869 } 867 }
870 exit(0); 868 exit(0);
871}], rxvt_cv_path_utmpx=`cat conftestval`, rxvt_cv_path_utmpx=, dnl 869}]])],[rxvt_cv_path_utmpx=`cat conftestval`],[rxvt_cv_path_utmpx=],[dnl
872 AC_MSG_WARN([Define RXVT_UTMPX_FILE in config.h manually]))]) 870 AC_MSG_WARN(Define RXVT_UTMPX_FILE in config.h manually)])])
873if test x$rxvt_cv_path_utmpx != x; then 871if test x$rxvt_cv_path_utmpx != x; then
874 AC_DEFINE_UNQUOTED(RXVT_UTMPX_FILE, "$rxvt_cv_path_utmpx", Define location of utmpx) 872 AC_DEFINE_UNQUOTED(RXVT_UTMPX_FILE, "$rxvt_cv_path_utmpx", Define location of utmpx)
875fi 873fi
876 874
877dnl# -------------------------------------------------------------------------- 875dnl# --------------------------------------------------------------------------
878 876
879dnl# find wtmp 877dnl# find wtmp
880AC_CACHE_CHECK(where wtmp is located, rxvt_cv_path_wtmp, 878AC_CACHE_CHECK(where wtmp is located, rxvt_cv_path_wtmp,
881[AC_TRY_RUN([#include <stdio.h> 879[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
882#include <sys/types.h> 880#include <sys/types.h>
883#ifdef HAVE_UTMP_H 881#ifdef HAVE_UTMP_H
884#include <utmp.h> 882#include <utmp.h>
885#endif 883#endif
886#include <errno.h> 884#include <errno.h>
… …
903 fprintf(f, "%s\n", *w); 901 fprintf(f, "%s\n", *w);
904 exit(0); 902 exit(0);
905 } 903 }
906 } 904 }
907 exit(0); 905 exit(0);
908}], rxvt_cv_path_wtmp=`cat conftestval`, rxvt_cv_path_wtmp=, dnl 906}]])],[rxvt_cv_path_wtmp=`cat conftestval`],[rxvt_cv_path_wtmp=],[dnl
909 AC_MSG_WARN([Define RXVT_WTMP_FILE in config.h manually]))]) 907 AC_MSG_WARN(Define RXVT_WTMP_FILE in config.h manually)])])
910if test x$rxvt_cv_path_wtmp != x; then 908if test x$rxvt_cv_path_wtmp != x; then
911 AC_DEFINE_UNQUOTED(RXVT_WTMP_FILE, "$rxvt_cv_path_wtmp", Define location of wtmp) 909 AC_DEFINE_UNQUOTED(RXVT_WTMP_FILE, "$rxvt_cv_path_wtmp", Define location of wtmp)
912fi 910fi
913dnl# -------------------------------------------------------------------------- 911dnl# --------------------------------------------------------------------------
914 912
915dnl# find wtmpx 913dnl# find wtmpx
916AC_CACHE_CHECK(where wtmpx is located, rxvt_cv_path_wtmpx, 914AC_CACHE_CHECK(where wtmpx is located, rxvt_cv_path_wtmpx,
917[AC_TRY_RUN([#include <stdio.h> 915[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
918#ifdef HAVE_UTMPX_H 916#ifdef HAVE_UTMPX_H
919#include <utmpx.h> 917#include <utmpx.h>
920#endif 918#endif
921#include <errno.h> 919#include <errno.h>
922main() 920main()
… …
938 fprintf(f, "%s\n", *w); 936 fprintf(f, "%s\n", *w);
939 exit(0); 937 exit(0);
940 } 938 }
941 } 939 }
942 exit(0); 940 exit(0);
943}], rxvt_cv_path_wtmpx=`cat conftestval`, rxvt_cv_path_wtmpx=, dnl 941}]])],[rxvt_cv_path_wtmpx=`cat conftestval`],[rxvt_cv_path_wtmpx=],[dnl
944 AC_MSG_WARN([Define RXVT_WTMPX_FILE in config.h manually]))]) 942 AC_MSG_WARN(Define RXVT_WTMPX_FILE in config.h manually)])])
945if test x$rxvt_cv_path_wtmpx != x; then 943if test x$rxvt_cv_path_wtmpx != x; then
946 AC_DEFINE_UNQUOTED(RXVT_WTMPX_FILE, "$rxvt_cv_path_wtmpx", Define location of wtmpx) 944 AC_DEFINE_UNQUOTED(RXVT_WTMPX_FILE, "$rxvt_cv_path_wtmpx", Define location of wtmpx)
947fi 945fi
948dnl# -------------------------------------------------------------------------- 946dnl# --------------------------------------------------------------------------
949 947
950dnl# find lastlog 948dnl# find lastlog
951AC_CACHE_CHECK(where lastlog is located, rxvt_cv_path_lastlog, 949AC_CACHE_CHECK(where lastlog is located, rxvt_cv_path_lastlog,
952[AC_TRY_RUN([#include <stdio.h> 950[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
953#include <sys/types.h> 951#include <sys/types.h>
954#ifdef HAVE_UTMPX_H 952#ifdef HAVE_UTMPX_H
955#include <utmpx.h> 953#include <utmpx.h>
956#elif defined(HAVE_UTMP_H) 954#elif defined(HAVE_UTMP_H)
957#include <utmp.h> 955#include <utmp.h>
… …
978 fprintf(f, "%s\n", *w); 976 fprintf(f, "%s\n", *w);
979 exit(0); 977 exit(0);
980 } 978 }
981 } 979 }
982 exit(0); 980 exit(0);
983}], rxvt_cv_path_lastlog=`cat conftestval`, rxvt_cv_path_lastlog=, dnl 981}]])],[rxvt_cv_path_lastlog=`cat conftestval`],[rxvt_cv_path_lastlog=],[dnl
984 AC_MSG_WARN([Define RXVT_LASTLOG_FILE in config.h manually]))]) 982 AC_MSG_WARN(Define RXVT_LASTLOG_FILE in config.h manually)])])
985if test x$rxvt_cv_path_lastlog != x; then 983if test x$rxvt_cv_path_lastlog != x; then
986 AC_DEFINE_UNQUOTED(RXVT_LASTLOG_FILE, "$rxvt_cv_path_lastlog", Define location of lastlog) 984 AC_DEFINE_UNQUOTED(RXVT_LASTLOG_FILE, "$rxvt_cv_path_lastlog", Define location of lastlog)
987 if test -d "$rxvt_cv_path_lastlog"; then 985 if test -d "$rxvt_cv_path_lastlog"; then
988 AC_DEFINE(LASTLOG_IS_DIR, 1, Define if lastlog is provided via a directory) 986 AC_DEFINE(LASTLOG_IS_DIR, 1, Define if lastlog is provided via a directory)
989 fi 987 fi
990fi 988fi
991dnl# -------------------------------------------------------------------------- 989dnl# --------------------------------------------------------------------------
992 990
993dnl# find lastlogx 991dnl# find lastlogx
994AC_CACHE_CHECK(where lastlogx is located, rxvt_cv_path_lastlogx, 992AC_CACHE_CHECK(where lastlogx is located, rxvt_cv_path_lastlogx,
995[AC_TRY_RUN([#include <stdio.h> 993[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
996#ifdef HAVE_UTMPX_H 994#ifdef HAVE_UTMPX_H
997#include <utmpx.h> 995#include <utmpx.h>
998#endif 996#endif
999#include <errno.h> 997#include <errno.h>
1000main() 998main()
… …
1015 fprintf(f, "%s\n", *w); 1013 fprintf(f, "%s\n", *w);
1016 exit(0); 1014 exit(0);
1017 } 1015 }
1018 } 1016 }
1019 exit(0); 1017 exit(0);
1020}], rxvt_cv_path_lastlogx=`cat conftestval`, rxvt_cv_path_lastlogx=, dnl 1018}]])],[rxvt_cv_path_lastlogx=`cat conftestval`],[rxvt_cv_path_lastlogx=],[dnl
1021 AC_MSG_WARN([Define RXVT_LASTLOGX_FILE in config.h manually]))]) 1019 AC_MSG_WARN(Define RXVT_LASTLOGX_FILE in config.h manually)])])
1022if test x$rxvt_cv_path_lastlogx != x; then 1020if test x$rxvt_cv_path_lastlogx != x; then
1023 AC_DEFINE_UNQUOTED(RXVT_LASTLOGX_FILE, "$rxvt_cv_path_lastlogx", Define location of lastlogx) 1021 AC_DEFINE_UNQUOTED(RXVT_LASTLOGX_FILE, "$rxvt_cv_path_lastlogx", Define location of lastlogx)
1024fi 1022fi
1025 1023
1026dnl# -------------------------------------------------------------------------- 1024dnl# --------------------------------------------------------------------------
… …
1050LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 1048LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
1051if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then 1049if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
1052 LIBS=`echo $LIBS | sed "$R_TRANSLATE"` 1050 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
1053fi 1051fi
1054AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 1052AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
1055[AC_TRY_RUN([#include <X11/Xlib.h> 1053[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
1056main() { 1054main() {
1057char *p; 1055char *p;
1058if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 1056if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
1059exit (XSupportsLocale() ? 0 : 1); 1057exit (XSupportsLocale() ? 0 : 1);
1060else 1058else
1061exit (1);}], dnl 1059exit (1);}]])],[dnl
1062 rxvt_cv_func_xlocale=yes, rxvt_cv_func_xlocale=no, dnl 1060 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
1063 AC_MSG_WARN([Define NO_XLOCALE in config.h manually]))]) 1061 AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])])
1064if test x$rxvt_cv_func_xlocale = xyes; then 1062if test x$rxvt_cv_func_xlocale = xyes; then
1065 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works) 1063 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works)
1066fi 1064fi
1067 1065
1068AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, 1066AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
1069[AC_TRY_LINK([#define X_LOCALE 1 1067[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
1070#include <X11/Xlocale.h>], 1068#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 1069if test x$rxvt_cv_func_xsetlocale = xyes; then
1074 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 1070 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
1075fi 1071fi
1076LIBS=$ac_save_LIBS 1072LIBS=$ac_save_LIBS
1077CFLAGS=$ac_save_CFLAGS 1073CFLAGS=$ac_save_CFLAGS
1078 1074
1079AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale, 1075AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
1080[AC_TRY_LINK([#include <clocale>], 1076[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 1077if test x$rxvt_cv_func_setlocale = xyes; then
1084 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works) 1078 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
1085fi 1079fi
1086 1080
1087AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo, 1081AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,
1088[AC_TRY_LINK([#include <langinfo.h>], 1082[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 1083if test x$rxvt_cv_func_nl_langinfo = xyes; then
1092 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) 1084 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
1093fi 1085fi
1094 1086
1087AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
1088[AC_COMPILE_IFELSE([
1089#include <X11/Xlib.h>
1090
1091void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
1092
1093void f() {
1094 XIMCallback cb;
1095 cb.callback = im_destroy_cb;
1096}
1097],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)])
1098
1099if test x$rxvt_broken_ximcb = xyes; then
1100 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
1101fi
1102
1095AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt, 1103AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt,
1096[AC_TRY_LINK([#define _GNU_SOURCE 1104[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define _GNU_SOURCE
1097#ifdef HAVE_STDLIB_H 1105#ifdef HAVE_STDLIB_H
1098# include <cstdlib> 1106# include <cstdlib>
1099#endif], 1107#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 1108if test x$rxvt_cv_func_getpt = xyes; then
1103 AC_DEFINE(HAVE_GETPT, 1, Define if you have _GNU_SOURCE getpt() ) 1109 AC_DEFINE(HAVE_GETPT, 1, Define if you have _GNU_SOURCE getpt() )
1104fi 1110fi
1105 1111
1106dnl# if we don't guess right then it's up to the user 1112dnl# 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 1170if 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) 1171 AC_DEFINE(PTYS_ARE_SEARCHED, 1, Define for this pty type)
1166fi 1172fi
1167 1173
1168 1174
1169AC_CHECKING(for pty ranges) 1175AS_MESSAGE(checking for pty ranges...)
1170ptys=`echo /dev/pty??` 1176ptys=`echo /dev/pty??`
1171pch1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'` 1177pch1=`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'` 1178pch2=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'`
1173if test x$pch1 != x; then 1179if test x$pch1 != x; then
1174 AC_DEFINE_UNQUOTED(PTYCHAR1, "$pch1", Define for first char in devptyXX) 1180 AC_DEFINE_UNQUOTED(PTYCHAR1, "$pch1", Define for first char in devptyXX)
… …
1178fi 1184fi
1179 1185
1180dnl# -------------------------------------------------------------------------- 1186dnl# --------------------------------------------------------------------------
1181dnl# now add and remove other stuff 1187dnl# now add and remove other stuff
1182dnl# -------------------------------------------------------------------------- 1188dnl# --------------------------------------------------------------------------
1189if test x$support_xft = xyes; then
1190 LIBS="$LIBS `pkg-config xft --libs`"
1191 CFLAGS="$CFLAGS `pkg-config xft --cflags`"
1192 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
1193
1194 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
1195 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
1196
1197 if test x$support_xft = xyes; then
1198 AC_DEFINE(XFT, 1, Define to enable xft support)
1199 fi
1200fi
1201if test x$support_styles = xyes; then
1202 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
1203fi
1204if test x$support_iso14755 = xyes; then
1205 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
1206fi
1183if test x$support_8bitctrls = xyes; then 1207if test x$support_8bitctrls = xyes; then
1184 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences) 1208 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
1185fi 1209fi
1186if test x$support_fading = xyes; then 1210if test x$support_fading = xyes; then
1187 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) 1211 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) 1223 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)
1200fi 1224fi
1201if test x$support_menubar = xyes; then 1225if test x$support_menubar = xyes; then
1202 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support) 1226 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support)
1203fi 1227fi
1204if test x$support_frills = xno; then 1228if test x$support_frills = xyes; then
1205 AC_DEFINE(NO_FRILLS, 1, Define if you don't want handling for rarely used features) 1229 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 1230fi
1210if test x$support_24bit = xyes; then 1231if 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) 1232 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 1233fi
1213if test x$support_mousewheel = xyes; then 1234if test x$support_mousewheel = xyes; then
… …
1263fi 1284fi
1264if test x$support_combining = xyes; then 1285if test x$support_combining = xyes; then
1265 AC_DEFINE(ENABLE_COMBINING, 1, Define if you want to automatically compose combining characters) 1286 AC_DEFINE(ENABLE_COMBINING, 1, Define if you want to automatically compose combining characters)
1266fi 1287fi
1267if test x$codesets = xall; then 1288if test x$codesets = xall; then
1268 codesets=jp,jp-ext,kr,cn,cn-ext 1289 codesets=jp,jp-ext,kr,zh,zh-ext
1269fi 1290fi
1291AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
1292AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
1270for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do 1293for 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 1294 case "$codeset" in
1274 JP ) AC_DEFINE(ENCODING_JP, 1, Define if you want japanese codesets) ;; 1295 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) ;; 1296 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) ;; 1297 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) ;; 1298 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) ;; 1299 ZH_EXT ) AC_DEFINE(ENCODING_ZH_EXT, 1, Define if you want extended chinese codesets) ;;
1279 esac 1300 esac
1280done 1301done
1281 1302
1282dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket) 1303dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket)
1283 1304
… …
1338RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch) 1359RXVT_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) 1360RXVT_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) 1361RXVT_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) 1362RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
1342 1363
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 \ 1364AC_CONFIG_FILES([autoconf/Make.common \
1357Makefile \ 1365Makefile \
1358doc/Makefile \ 1366doc/Makefile \
1359src/Makefile \ 1367src/Makefile \
1360src/test/Makefile \ 1368src/test/Makefile \
1361src/rxvtlib.h \ 1369src/rxvtlib.h \
1362W11/Makefile \ 1370W11/Makefile \
1363) 1371])
1372AC_OUTPUT
1364 1373
1365echo "Configuration: 1374echo "Configuration:
1366 1375
1367 Rxvt version: $VERSION : $DATE 1376 Rxvt version: $VERSION : $DATE
1368 Source code location: $srcdir 1377 Source code location: $srcdir

Diff Legend

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