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.34 by root, Tue Aug 17 08:47:56 2004 UTC vs.
Revision 1.51 by root, Wed Feb 16 21:21:43 2005 UTC

1dnl# -*- sh -*- 1dnl# -*- sh -*-
2dnl# 2dnl#
3dnl# Process this file with autoconf to produce a configure script. 3dnl# Process this file with autoconf to produce a configure script.
4dnl# 4dnl#
5orig_CXXFLAGS="$CXXFLAGS"
6
5AC_INIT 7AC_INIT
6AC_CONFIG_SRCDIR([src/feature.h]) 8AC_CONFIG_SRCDIR([src/feature.h])
7AC_CONFIG_AUX_DIR(autoconf) 9AC_CONFIG_AUX_DIR(autoconf)
8AC_CONFIG_HEADER(config.h:autoconf/config.h.in) 10AC_CONFIG_HEADER(config.h:autoconf/config.h.in)
9 11
12AC_CANONICAL_HOST
13
10dnl RXVT version 14dnl RXVT version
11changequote(, )dnl 15changequote(, )dnl
12VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 16VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
13DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 17DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
14LSMDATE=`sed -n -e 's/^.*[ \t]LSMDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
15LIBVERSION=`sed -n -e 's/^.*[ \t]LIBVERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 18dnl LIBVERSION=`sed -n -e 's/^.*[ \t]LIBVERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
16changequote([, ])dnl 19changequote([, ])dnl
17AC_SUBST(VERSION)dnl 20AC_SUBST(VERSION)dnl
18AC_SUBST(DATE)dnl 21AC_SUBST(DATE)dnl
19AC_SUBST(LSMDATE)dnl 22AC_SUBST(LSMDATE)dnl
20AC_SUBST(LIBVERSION)dnl 23AC_SUBST(LIBVERSION)dnl
… …
31AC_PROG_INSTALL 34AC_PROG_INSTALL
32AC_PROG_AWK 35AC_PROG_AWK
33 36
34AC_LANG(C) 37AC_LANG(C)
35 38
39dnl# --------------------------------------------------------------------------
40dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
41dnl#
42if test -z "$orig_CXXFLAGS"; then
43 CXXFLAGS='-O'
44 if test x$GCC = xyes && test "x$GXX" = xyes; then
45 CXXFLAGS="-g -O3"
46 fi
47 CFLAGS="$CXXFLAGS"
48fi
49
36LINKER="$CXX" 50LINKER="$CXX"
37if test x$GCC = xyes && test x$GXX = xyes; then 51if test x$GCC = xyes && test x$GXX = xyes; then
38 AC_CHECK_LIB(supc++, main, [ 52 AC_CHECK_LIB(supc++, main, [
39 LINKER="$CC" 53 LINKER="$CC"
40 LIBS="$LIBS -lsupc++" 54 LIBS="$LIBS -lsupc++"
41 ]) 55 ])
42fi 56fi
43AC_SUBST(LINKER,[$LINKER]) 57AC_SUBST(LINKER,[$LINKER])
44 58
45CPPFLAGS="-D_GNU_SOURCE -D_XOPEN_SOURCE" 59AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)
60
61case $host in
62 *-*-solaris* )
63 AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
64 AC_DEFINE(_XOPEN_SOURCE, 2, Needed to get declarations for msg_control and msg_controllen on Solaris)
65 AC_DEFINE(__EXTENSIONS__, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
66 ;;
67esac
46 68
47dnl if test x$GXX = xyes; then 69dnl if test x$GXX = xyes; then
48dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now... 70dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now...
49dnl fi 71dnl fi
50 72
… …
59 81
60dnl solaris needs to link libnsl and socket 82dnl solaris needs to link libnsl and socket
61AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"]) 83AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])
62AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"]) 84AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])
63 85
64AC_ENABLE_SHARED(no)dnl# libtool 86dnl AC_ENABLE_SHARED(no)dnl# libtool
65AC_ENABLE_STATIC(yes)dnl# libtool 87dnl AC_ENABLE_STATIC(yes)dnl# libtool
66AC_PROG_LIBTOOL()dnl# libtool 88dnl AC_PROG_LIBTOOL()dnl# libtool
67 89
68MALLOC_TYPE=S 90MALLOC_TYPE=S
69support_addstrings=no 91support_addstrings=no
70support_frills=no 92support_frills=no
71support_linespace=no
72support_inheritpixmap=no 93support_inheritpixmap=no
73support_tinting=no 94support_tinting=no
74support_fading=no 95support_fading=no
75support_keepscrolling=no 96support_keepscrolling=no
76support_selectionscrolling=no 97support_selectionscrolling=no
… …
92support_xft=no 113support_xft=no
93support_unicode3=no 114support_unicode3=no
94support_combining=no 115support_combining=no
95support_8bitctrls=no 116support_8bitctrls=no
96support_iso14755=no 117support_iso14755=no
118support_styles=no
97codesets= 119codesets=
98 120
99dnl# -------------------------------------------------------------------------- 121dnl# --------------------------------------------------------------------------
100dnl# CHECKING COMMAND LINE OPTIONS 122dnl# CHECKING COMMAND LINE OPTIONS
101dnl# -------------------------------------------------------------------------- 123dnl# --------------------------------------------------------------------------
… …
111 NOTE: this option is order dependent 133 NOTE: this option is order dependent
112 NOTE: automatically enabled with --enable-shared], 134 NOTE: automatically enabled with --enable-shared],
113 [if test x$enableval = xyes; then 135 [if test x$enableval = xyes; then
114 support_24bit=yes 136 support_24bit=yes
115 support_frills=yes 137 support_frills=yes
116 support_linespace=yes
117 support_inheritpixmap=yes 138 support_inheritpixmap=yes
118 support_tinting=yes 139 support_tinting=yes
119 support_fading=yes 140 support_fading=yes
120 support_keepscrolling=yes 141 support_keepscrolling=yes
121 support_selectionscrolling=yes 142 support_selectionscrolling=yes
… …
137 support_xft=yes 158 support_xft=yes
138 support_unicode3=yes 159 support_unicode3=yes
139 support_combining=yes 160 support_combining=yes
140 #support_8bitctrls=yes 161 #support_8bitctrls=yes
141 support_iso14755=yes 162 support_iso14755=yes
163 support_styles=yes
142 codesets=all 164 codesets=all
143 fi]) 165 fi])
144 166
145AC_ARG_ENABLE(unicode3, 167AC_ARG_ENABLE(unicode3,
146 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters], 168 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters],
147 [if test x$enableval = xyes -o x$enableval = xno; then 169 [if test x$enableval = xyes -o x$enableval = xno; then
148 support_unicode3=yes 170 support_unicode3=$enableval
149 fi]) 171 fi])
150 172
151AC_ARG_ENABLE(combining, 173AC_ARG_ENABLE(combining,
152 [ --enable-combining enable composition of base and combining characters], 174 [ --enable-combining enable composition of base and combining characters],
153 [if test x$enableval = xyes -o x$enableval = xno; then 175 [if test x$enableval = xyes -o x$enableval = xno; then
154 support_combining=yes 176 support_combining=$enableval
155 fi]) 177 fi])
156 178
157AC_ARG_ENABLE(xft, 179AC_ARG_ENABLE(xft,
158 [ --enable-xft enable xft support on systems that have it], 180 [ --enable-xft enable xft support on systems that have it],
159 [if test x$enableval = xyes -o x$enableval = xno; then 181 [if test x$enableval = xyes -o x$enableval = xno; then
160 support_xft=yes 182 support_xft=$enableval
183 fi])
184
185AC_ARG_ENABLE(font-styles,
186 [ --enable-font-styles enable bold and italic support],
187 [if test x$enableval = xyes -o x$enableval = xno; then
188 support_styles=$enableval
161 fi]) 189 fi])
162 190
163AC_ARG_ENABLE(utmp, 191AC_ARG_ENABLE(utmp,
164 [ --enable-utmp enable utmp (utmpx) support], 192 [ --enable-utmp enable utmp (utmpx) support],
165 [if test x$enableval = xyes -o x$enableval = xno; then 193 [if test x$enableval = xyes -o x$enableval = xno; then
… …
237 [if test x$enableval = xyes; then 265 [if test x$enableval = xyes; then
238 AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less) 266 AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less)
239 fi]) 267 fi])
240 268
241AC_ARG_WITH(codesets, 269AC_ARG_WITH(codesets,
242 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,cn,cn_ext,all)], 270 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
243 [codesets="$withval"]) 271 [codesets="$withval"])
244 272
245AC_ARG_ENABLE(xim, 273AC_ARG_ENABLE(xim,
246 [ --enable-xim XIM (X Input Method) protocol support], 274 [ --enable-xim XIM (X Input Method) protocol support],
247 [if test x$enableval = xyes -o x$enableval = xno; then 275 [if test x$enableval = xyes -o x$enableval = xno; then
… …
279 fi]) 307 fi])
280 308
281AC_ARG_ENABLE(8bitctrls, 309AC_ARG_ENABLE(8bitctrls,
282 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)], 310 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)],
283 [if test x$enableval = xyes -o x$enableval = xno; then 311 [if test x$enableval = xyes -o x$enableval = xno; then
284 support_8bitctrls=yes 312 support_8bitctrls=$enableval
285 fi]) 313 fi])
286 314
287RESFALLBACK=Rxvt 315RESFALLBACK=Rxvt
288AC_ARG_ENABLE(fallback, 316AC_ARG_ENABLE(fallback,
289 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)], 317 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)],
… …
311 339
312RXVTNAME=urxvt 340RXVTNAME=urxvt
313AC_ARG_WITH(name, 341AC_ARG_WITH(name,
314 [ --with-name=NAME set the basename for the installed binaries (default: urxvt)], 342 [ --with-name=NAME set the basename for the installed binaries (default: urxvt)],
315 [RXVTNAME="$withval"]) 343 [RXVTNAME="$withval"])
344AC_DEFINE_UNQUOTED(RXVTNAME,"$RXVTNAME", [Binary base name])
316 345
317RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"` 346RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"`
318AC_SUBST(RXVTNAME) 347AC_SUBST(RXVTNAME)
319 348
320AC_ARG_ENABLE(strings, 349AC_ARG_ENABLE(strings,
… …
337 366
338AC_ARG_ENABLE(frills, 367AC_ARG_ENABLE(frills,
339 [ --enable-frills enable support for rarely used features], 368 [ --enable-frills enable support for rarely used features],
340 [if test x$enableval = xyes -o x$enableval = xno; then 369 [if test x$enableval = xyes -o x$enableval = xno; then
341 support_frills=$enableval 370 support_frills=$enableval
342 fi])
343
344AC_ARG_ENABLE(linespace,
345 [ --enable-linespace enable support for linespace],
346 [if test x$enableval = xyes -o x$enableval = xno; then
347 support_linespace=$enableval
348 fi]) 371 fi])
349 372
350AC_ARG_ENABLE(24bit, 373AC_ARG_ENABLE(24bit,
351 [ --enable-24bit enable support for using 24bit visuals if available], 374 [ --enable-24bit enable support for using 24bit visuals if available],
352 [if test x$enableval = xyes -o x$enableval = xno; then 375 [if test x$enableval = xyes -o x$enableval = xno; then
… …
434 457
435dnl# -------------------------------------------------------------------------- 458dnl# --------------------------------------------------------------------------
436 459
437AC_DEFINE(PROTOTYPES, 1, Define if you need function prototypes) 460AC_DEFINE(PROTOTYPES, 1, Define if you need function prototypes)
438 461
439dnl# --------------------------------------------------------------------------
440dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
441dnl#
442if test -z "$CFLAGS"; then
443 if test -z "$CCOPTS"; then
444 CCOPTS='-O'
445dnl> if test "x$GCC" = xyes; then
446dnl> if test x$system = xLinux; then
447dnl> CCOPTS="$CCOPTS "'-O2 -fno-strength-reduce'
448dnl> fi
449dnl> fi
450 fi
451 CFLAGS="$CCOPTS"
452fi
453
454AC_PATH_PROG(MV, mv, mv) 462AC_PATH_PROG(MV, mv, mv)
455AC_PATH_PROG(RM, rm, rm) 463AC_PATH_PROG(RM, rm, rm)
456AC_PATH_PROG(CP, cp, cp) 464AC_PATH_PROG(CP, cp, cp)
457AC_PATH_PROG(LN, ln, ln) 465AC_PATH_PROG(LN, ln, ln)
458AC_PATH_PROG(SED, sed, sed) 466AC_PATH_PROG(SED, sed, sed)
459AC_PATH_PROG(ECHO, echo, echo) 467AC_PATH_PROG(ECHO, echo, echo)
460AC_PATH_PROG(CMP, cmp, cmp) 468AC_PATH_PROG(CMP, cmp, cmp)
461AC_PATH_PROG(TBL, tbl) 469AC_PATH_PROG(TBL, tbl)
470AC_PATH_PROG(TIC, tic)
462 471
463dnl# need a neat way to detect SVR4 or its features 472dnl# need a neat way to detect SVR4 or its features
464dnl# in src/command.c we use these functions: 473dnl# in src/command.c we use these functions:
465dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> 474dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
466dnl# - but are these also defined for other systems? 475dnl# - but are these also defined for other systems?
… …
508 sys/stropts.h \ 517 sys/stropts.h \
509 sys/time.h \ 518 sys/time.h \
510 utmp.h \ 519 utmp.h \
511 utmpx.h \ 520 utmpx.h \
512 stdint.h \ 521 stdint.h \
522 pty.h \
523 wchar.h \
524 cwchar \
525 clocale \
513) 526)
514 527
515AC_HEADER_TIME 528AC_HEADER_TIME
516 529
517dnl# check to allow both <termios.h> and <sys/ioctl.h> 530dnl# check to allow both <termios.h> and <sys/ioctl.h>
… …
585dnl> AC_CHECK_TYPE(umode_t, int) 598dnl> AC_CHECK_TYPE(umode_t, int)
586dnl> AC_CHECK_TYPE(off_t, long) 599dnl> AC_CHECK_TYPE(off_t, long)
587AC_TYPE_PID_T 600AC_TYPE_PID_T
588AC_TYPE_UID_T 601AC_TYPE_UID_T
589 602
590AC_CHECK_SIZEOF(char, 1)
591AC_CHECK_SIZEOF(short, 2) 603AC_CHECK_SIZEOF(short, 2)
592AC_CHECK_SIZEOF(int, 4) 604AC_CHECK_SIZEOF(int, 4)
593AC_CHECK_SIZEOF(long, 4) 605dnl AC_CHECK_SIZEOF(long, 4)
594AC_CHECK_SIZEOF(long long, 8) 606AC_CHECK_SIZEOF(long long, 8)
595AC_CHECK_SIZEOF(int *, 4) 607AC_CHECK_SIZEOF(int *, 4)
596 608
597dnl# see usage below 609dnl# see usage below
598AC_DEFUN(RXVT_CHECK_SIZE, 610AC_DEFUN(RXVT_CHECK_SIZE,
599 [AC_CACHE_CHECK([for $2], $1, 611 [AC_CACHE_CHECK([for $2], $1,
600 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl 612 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[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"
606 else 618 else
607 if test $ac_cv_sizeof_int -ge $3; then 619 if test "$ac_cv_sizeof_int" -ge $3; then
608 $1="$4 int" 620 $1="$4 int"
609 else 621 else
610 if test $ac_cv_sizeof_long -ge $3; then 622 if test "$ac_cv_sizeof_long" -ge $3; then
611 $1="$4 long" 623 $1="$4 long"
612 else 624 else
613 if test $ac_cv_sizeof_long_long -ge $3; then 625 if test "$ac_cv_sizeof_long_long" -ge $3; then
614 $1="$4 long long" 626 $1="$4 long long"
615 else 627 else
616 $1="$4 $5" # we _must_ have a (possibly wrong) default 628 $1="$4 $5" # we _must_ have a (possibly wrong) default
617 fi 629 fi
618 fi 630 fi
… …
645dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef) 657dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
646dnl AC_SUBST(rxvt_uint64_typedef) 658dnl AC_SUBST(rxvt_uint64_typedef)
647dnl# 659dnl#
648dnl# Now look for another we use 660dnl# Now look for another we use
649dnl# 661dnl#
650if test $ac_cv_sizeof_int_p -eq 8; then 662if test "$ac_cv_sizeof_int_p" -eq 8; then
651 rxvt_intp_define="#define intp_t int64_t" 663 rxvt_intp_define="#define intp_t int64_t"
652 rxvt_u_intp_define="#define u_intp_t u_int64_t" 664 rxvt_u_intp_define="#define u_intp_t u_int64_t"
653else 665else
654 if test $ac_cv_sizeof_int_p -eq 4; then 666 if test "$ac_cv_sizeof_int_p" -eq 4; then
655 rxvt_intp_define="#define intp_t int32_t" 667 rxvt_intp_define="#define intp_t int32_t"
656 rxvt_u_intp_define="#define u_intp_t u_int32_t" 668 rxvt_u_intp_define="#define u_intp_t u_int32_t"
657 else 669 else
658 if test $ac_cv_sizeof_int_p -eq 2; then 670 if test "$ac_cv_sizeof_int_p" -eq 2; then
659 rxvt_intp_define="#define intp_t int16_t" 671 rxvt_intp_define="#define intp_t int16_t"
660 rxvt_u_intp_define="#define u_intp_t u_int16_t" 672 rxvt_u_intp_define="#define u_intp_t u_int16_t"
661 else 673 else
662 rxvt_intp_define="#error set intp_t" 674 rxvt_intp_define="#error set intp_t"
663 rxvt_u_intp_define="#error set u_intp_t" 675 rxvt_u_intp_define="#error set u_intp_t"
… …
695 unlockpt \ 707 unlockpt \
696 isastream \ 708 isastream \
697 on_exit \ 709 on_exit \
698 nanosleep \ 710 nanosleep \
699 updwtmp \ 711 updwtmp \
712 updwtmpx \
700 ttyslot \ 713 ttyslot \
701) 714)
702dnl# Note: On NetBSD, openpty() exists in libutil. Don't pull it in 715dnl# Note: On NetBSD, openpty() exists in libutil. Don't pull it in
703 716
704dnl# -------------------------------------------------------------------------- 717dnl# --------------------------------------------------------------------------
… …
747[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> 760[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
748#include <utmpx.h>]], [[struct utmpx utx; utx.ut_host;]])],[rxvt_cv_struct_utmpx_host=yes],[rxvt_cv_struct_utmpx_host=no])]) 761#include <utmpx.h>]], [[struct utmpx utx; utx.ut_host;]])],[rxvt_cv_struct_utmpx_host=yes],[rxvt_cv_struct_utmpx_host=no])])
749if test x$rxvt_cv_struct_utmpx_host = xyes; then 762if test x$rxvt_cv_struct_utmpx_host = xyes; then
750 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)
751fi 764fi
765
766AC_CACHE_CHECK(for session in utmpx struct, rxvt_cv_struct_utmpx_session,
767[AC_TRY_COMPILE([#include <sys/types.h>
768#include <utmpx.h>],
769[struct utmpx utx; utx.ut_session;],
770rxvt_cv_struct_utmpx_session=yes, rxvt_cv_struct_utmpx_session=no)])
771if test x$rxvt_cv_struct_utmpx_session = xyes; then
772 AC_DEFINE(HAVE_UTMPX_SESSION, 1, Define if struct utmpx contains ut_session)
773fi
752) dnl# AC_CHECK_HEADER(utmpx.h 774) dnl# AC_CHECK_HEADER(utmpx.h
753
754 775
755dnl# -------------------------------------------------------------------------- 776dnl# --------------------------------------------------------------------------
756dnl# check for struct lastlog 777dnl# check for struct lastlog
757AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog, 778AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog,
758[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> 779[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
… …
1172fi 1193fi
1173 1194
1174dnl# -------------------------------------------------------------------------- 1195dnl# --------------------------------------------------------------------------
1175dnl# now add and remove other stuff 1196dnl# now add and remove other stuff
1176dnl# -------------------------------------------------------------------------- 1197dnl# --------------------------------------------------------------------------
1198if test x$support_xft = xyes; then
1199 LIBS="$LIBS `pkg-config xft --libs`"
1200 CFLAGS="$CFLAGS `pkg-config xft --cflags`"
1201 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
1202
1203 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
1204 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
1205
1206 if test x$support_xft = xyes; then
1207 AC_DEFINE(XFT, 1, Define to enable xft support)
1208 fi
1209fi
1210if test x$support_styles = xyes; then
1211 AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
1212fi
1177if test x$support_iso14755 = xyes; then 1213if test x$support_iso14755 = xyes; then
1178 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support) 1214 AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
1179fi 1215fi
1180if test x$support_8bitctrls = xyes; then 1216if test x$support_8bitctrls = xyes; then
1181 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences) 1217 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
… …
1198if test x$support_menubar = xyes; then 1234if test x$support_menubar = xyes; then
1199 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support) 1235 AC_DEFINE(MENUBAR, 1, Define if you want Menubar support)
1200fi 1236fi
1201if test x$support_frills = xyes; then 1237if test x$support_frills = xyes; then
1202 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features) 1238 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
1203fi
1204if test x$support_linespace = xno; then
1205 AC_DEFINE(NO_LINESPACE, 1, Define if you don't want support linespace)
1206fi 1239fi
1207if test x$support_24bit = xyes; then 1240if test x$support_24bit = xyes; then
1208 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) 1241 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)
1209fi 1242fi
1210if test x$support_mousewheel = xyes; then 1243if test x$support_mousewheel = xyes; then
… …
1260fi 1293fi
1261if test x$support_combining = xyes; then 1294if test x$support_combining = xyes; then
1262 AC_DEFINE(ENABLE_COMBINING, 1, Define if you want to automatically compose combining characters) 1295 AC_DEFINE(ENABLE_COMBINING, 1, Define if you want to automatically compose combining characters)
1263fi 1296fi
1264if test x$codesets = xall; then 1297if test x$codesets = xall; then
1265 codesets=jp,jp-ext,kr,cn,cn-ext 1298 codesets=jp,jp-ext,kr,zh,zh-ext
1266fi 1299fi
1267AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets) 1300AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
1268AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets) 1301AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
1269for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do 1302for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do
1270 case "$codeset" in 1303 case "$codeset" in
1271 JP ) AC_DEFINE(ENCODING_JP, 1, Define if you want japanese codesets) ;; 1304 JP ) AC_DEFINE(ENCODING_JP, 1, Define if you want japanese codesets) ;;
1272 JP_EXT ) AC_DEFINE(ENCODING_JP_EXT, 1, Define if you want extended japanese codesets) ;; 1305 JP_EXT ) AC_DEFINE(ENCODING_JP_EXT, 1, Define if you want extended japanese codesets) ;;
1273 KR ) AC_DEFINE(ENCODING_KR, 1, Define if you want korean codesets) ;; 1306 KR ) AC_DEFINE(ENCODING_KR, 1, Define if you want korean codesets) ;;
1274 CN ) AC_DEFINE(ENCODING_CN, 1, Define if you want chinese codesets) ;; 1307 ZH ) AC_DEFINE(ENCODING_ZH, 1, Define if you want chinese codesets) ;;
1275 CN_EXT ) AC_DEFINE(ENCODING_CN_EXT, 1, Define if you want extended chinese codesets) ;; 1308 ZH_EXT ) AC_DEFINE(ENCODING_ZH_EXT, 1, Define if you want extended chinese codesets) ;;
1276 esac 1309 esac
1277done 1310done
1278 1311
1279dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket) 1312dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket)
1280 1313
… …
1335RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch) 1368RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch)
1336RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch) 1369RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
1337RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch) 1370RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)
1338RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes) 1371RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
1339 1372
1340if test x$support_xft = xyes; then
1341 LIBS="$LIBS `pkg-config xft --libs`"
1342 CFLAGS="$CFLAGS `pkg-config xft --cflags`"
1343 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
1344
1345 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
1346 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
1347
1348 if test x$support_xft = xyes; then
1349 AC_DEFINE(XFT, 1, Define to enable xft support)
1350 fi
1351fi
1352
1353AC_CONFIG_FILES([autoconf/Make.common \ 1373AC_CONFIG_FILES([autoconf/Make.common \
1354Makefile \ 1374Makefile \
1355doc/Makefile \ 1375doc/Makefile \
1356src/Makefile \ 1376src/Makefile \
1357src/test/Makefile \
1358src/rxvtlib.h \ 1377src/rxvtlib.h \
1359W11/Makefile \
1360]) 1378])
1361AC_OUTPUT 1379AC_OUTPUT
1362 1380
1363echo "Configuration: 1381echo "Configuration:
1364 1382

Diff Legend

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