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

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.76 by ayin, Tue Sep 18 12:17:58 2007 UTC vs.
Revision 1.104 by root, Sun Jan 6 21:34:57 2008 UTC

11 11
12dnl RXVT version 12dnl RXVT version
13changequote(, )dnl 13changequote(, )dnl
14VERSION=`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`
15DATE=`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`
16dnl LIBVERSION=`sed -n -e 's/^.*[ \t]LIBVERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
17changequote([, ])dnl 16changequote([, ])dnl
18AC_SUBST(VERSION)dnl 17AC_SUBST(VERSION)dnl
19AC_SUBST(DATE)dnl 18AC_SUBST(DATE)dnl
20AC_SUBST(LSMDATE)dnl 19
21AC_SUBST(LIBVERSION)dnl
22echo "" 20echo ""
23echo "configuring for rxvt $VERSION" 21echo "configuring for rxvt $VERSION"
24echo "" 22echo ""
25 23
26orig_CXXFLAGS="$CXXFLAGS" 24orig_CXXFLAGS="$CXXFLAGS"
27 25
28dnl# Checks for programs. 26dnl# Checks for programs.
29dnl AC_MAKE_SET
30
31AC_PROG_CC 27AC_PROG_CC
32AC_PROG_CXX 28AC_PROG_CXX
33AC_PROG_CPP 29AC_PROG_CPP
34AC_PROG_INSTALL 30AC_PROG_INSTALL
35 31
36AC_AIX 32AC_AIX
33AC_GNU_SOURCE
37AC_ISC_POSIX 34AC_ISC_POSIX
38AC_LANG(C++) 35AC_LANG(C++)
39 36
40dnl check wether we can link with gcc -lsupc++ 37dnl check wether we can link with gcc -lsupc++
41if test x$GCC = xyes && test x$GXX = xyes; then 38if test x$GCC = xyes && test x$GXX = xyes; then
62dnl# -------------------------------------------------------------------------- 59dnl# --------------------------------------------------------------------------
63dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' 60dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
64dnl# 61dnl#
65if test -z "$orig_CXXFLAGS"; then 62if test -z "$orig_CXXFLAGS"; then
66 if test x$GCC = xyes && test "x$GXX" = xyes; then 63 if test x$GCC = xyes && test "x$GXX" = xyes; then
67 CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs" 64 CXXFLAGS="-g -O3 -fno-rtti -fvisibility-inlines-hidden -fno-threadsafe-statics -fno-enforce-eh-specs"
68 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"]) 65 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"])
69 else 66 else
70 CXXFLAGS="-O" 67 CXXFLAGS="-O"
71 fi 68 fi
72 CFLAGS="$CXXFLAGS" 69 CFLAGS="$CXXFLAGS"
73fi 70fi
74 71
75AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)
76
77case $host in 72case $host in
78 *-*-solaris* ) 73 *-*-solaris* )
79 AC_DEFINE(_XOPEN_SOURCE, 500, Needed to get declarations for msg_control and msg_controllen on Solaris) 74 AC_DEFINE(_XOPEN_SOURCE, 500, Needed to get declarations for msg_control and msg_controllen on Solaris)
80 ;; 75 ;;
81esac 76esac
82 77
83dnl if test x$GXX = xyes; then
84dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now...
85dnl fi
86
87dnl# FreeBSD needs to link libxpg4 78dnl# FreeBSD needs to link libxpg4
88AC_CHECK_FUNC(setlocale, [], [AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])]) 79AC_CHECK_FUNC(setlocale, [], [AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])])
89 80
90dnl# solaris needs to link libnsl and socket 81dnl# solaris needs to link libnsl and socket
91AC_CHECK_FUNC(gethostbyname, [], [AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])]) 82AC_CHECK_FUNC(gethostbyname, [], [AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])])
92AC_CHECK_FUNC(socket, [], [AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])]) 83AC_CHECK_FUNC(socket, [], [AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])])
93
94dnl AC_ENABLE_SHARED(no)dnl# libtool
95dnl AC_ENABLE_STATIC(yes)dnl# libtool
96dnl AC_PROG_LIBTOOL()dnl# libtool
97 84
98support_frills=yes 85support_frills=yes
99support_inheritpixmap=yes 86support_inheritpixmap=yes
100support_fading=yes 87support_fading=yes
101support_keepscrolling=yes 88support_keepscrolling=yes
122 109
123dnl# -------------------------------------------------------------------------- 110dnl# --------------------------------------------------------------------------
124dnl# CHECKING COMMAND LINE OPTIONS 111dnl# CHECKING COMMAND LINE OPTIONS
125dnl# -------------------------------------------------------------------------- 112dnl# --------------------------------------------------------------------------
126 113
127if test "x$enable_shared" = xyes; then
128 AC_DEFINE(LIBRXVT, 1, Build shared library version - specify via configure only)
129 INSTALL_LIBRXVT=yes
130fi
131AC_SUBST(INSTALL_LIBRXVT)
132
133AC_ARG_ENABLE(everything, 114AC_ARG_ENABLE(everything,
134 [ --enable-everything enable standard non-multichoice features 115 [ --enable-everything enable standard non-multichoice features
135 NOTE: this option is order dependent 116 NOTE: this option is order dependent],
136 NOTE: automatically enabled with --enable-shared],
137 [ 117 [
138 if test x$enableval = xno; then 118 if test x$enableval = xno; then
139 support_frills=no 119 support_frills=no
140 support_inheritpixmap=no 120 support_inheritpixmap=no
141 support_fading=no 121 support_fading=no
193 support_perl=yes 173 support_perl=yes
194 codesets=all 174 codesets=all
195 fi 175 fi
196 ]) 176 ])
197 177
178WARNINGS=no
179AC_ARG_ENABLE(warnings,
180 [ --enable-warnings turn on g++ warnings],
181 [if test x$enableval = xyes; then
182 WARNINGS=yes
183 fi])
184if test x$GXX = xyes; then
185 if test $WARNINGS = yes; then
186 save_CXXFLAGS="$CXXFLAGS"
187 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor"
188 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"])
189 else
190 CXXFLAGS="$CXXFLAGS -w"
191 fi
192fi
193
198AC_ARG_ENABLE(unicode3, 194AC_ARG_ENABLE(unicode3,
199 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters], 195 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters],
200 [if test x$enableval = xyes -o x$enableval = xno; then 196 [if test x$enableval = xyes -o x$enableval = xno; then
201 support_unicode3=$enableval 197 support_unicode3=$enableval
202 fi]) 198 fi])
218 [if test x$enableval = xyes -o x$enableval = xno; then 214 [if test x$enableval = xyes -o x$enableval = xno; then
219 support_styles=$enableval 215 support_styles=$enableval
220 fi]) 216 fi])
221 217
222AC_ARG_ENABLE(afterimage, 218AC_ARG_ENABLE(afterimage,
223 [ --enable-afterimage enable integration with libAfterImage for background images], 219 [ --enable-afterimage enable integration with libAfterImage for background images],
224 [if test x$enableval = xyes -o x$enableval = xno; then 220 [if test x$enableval = xyes -o x$enableval = xno; then
225 support_afterimage=$enableval 221 support_afterimage=$enableval
226 fi]) 222 fi])
227 223
228AC_ARG_WITH(afterimage_config, 224AC_ARG_WITH(afterimage_config,
265 [ --enable-xterm-scroll enable Xterm style scrollbar], 261 [ --enable-xterm-scroll enable Xterm style scrollbar],
266 [if test x$enableval = xyes -o x$enableval = xno; then 262 [if test x$enableval = xyes -o x$enableval = xno; then
267 support_scroll_xterm=$enableval 263 support_scroll_xterm=$enableval
268 fi]) 264 fi])
269 265
266AC_ARG_ENABLE(plain-scroll,
267 [ --enable-plain-scroll enable plain style scrollbar],
268 [if test x$enableval = xyes -o x$enableval = xno; then
269 support_scroll_plain=$enableval
270 fi])
271
270AC_ARG_ENABLE(perl, 272AC_ARG_ENABLE(perl,
271 [ --enable-perl enable embedded perl interpreter], 273 [ --enable-perl enable embedded perl interpreter],
272 [if test x$enableval = xyes -o x$enableval = xno; then 274 [if test x$enableval = xyes -o x$enableval = xno; then
273 support_perl=$enableval 275 support_perl=$enableval
274 fi]) 276 fi])
275 277
276AC_ARG_ENABLE(plain-scroll,
277 [ --enable-plain-scroll enable plain style scrollbar],
278 [if test x$enableval = xyes -o x$enableval = xno; then
279 support_scroll_plain=$enableval
280 fi])
281
282AC_ARG_WITH(codesets, 278AC_ARG_WITH(codesets,
283 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)], 279 [ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
284 [codesets="$withval"]) 280 [codesets="$withval"])
285 281
286AC_ARG_ENABLE(xim, 282AC_ARG_ENABLE(xim,
287 [ --enable-xim XIM (X Input Method) protocol support], 283 [ --enable-xim XIM (X Input Method) protocol support],
288 [if test x$enableval = xyes -o x$enableval = xno; then 284 [if test x$enableval = xyes -o x$enableval = xno; then
313 support_8bitctrls=$enableval 309 support_8bitctrls=$enableval
314 fi]) 310 fi])
315 311
316RESFALLBACK=Rxvt 312RESFALLBACK=Rxvt
317AC_ARG_ENABLE(fallback, 313AC_ARG_ENABLE(fallback,
318 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)], 314 [ --enable-fallback@<:@=CLASS@:>@ fall back on CLASS resources in addition to URxvt ones (default: Rxvt)],
319 [ 315 [
320 test x$enableval = xyes && enableval=Rxvt 316 test x$enableval = xyes && enableval=Rxvt
321 test x$enableval = xno && enableval= 317 test x$enableval = xno && enableval=
322 RESFALLBACK="$enableval" 318 RESFALLBACK="$enableval"
323 ]) 319 ])
382 [if test x$enableval = xyes -o x$enableval = xno; then 378 [if test x$enableval = xyes -o x$enableval = xno; then
383 support_mousewheel=$enableval 379 support_mousewheel=$enableval
384 fi]) 380 fi])
385 381
386AC_ARG_ENABLE(slipwheeling, 382AC_ARG_ENABLE(slipwheeling,
387 [ --enable-slipwheeling enable slip wheel scrolling (requires previous)], 383 [ --enable-slipwheeling enable slip wheel scrolling (requires --enable-mousewheel)],
388 [if test x$enableval = xyes -o x$enableval = xno; then 384 [if test x$enableval = xyes -o x$enableval = xno; then
389 support_mouseslipwheel=$enableval 385 support_mouseslipwheel=$enableval
390 fi]) 386 fi])
391 387
392AC_ARG_ENABLE(smart-resize, 388AC_ARG_ENABLE(smart-resize,
419 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" 415 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
420 fi]) 416 fi])
421 417
422dnl# -------------------------------------------------------------------------- 418dnl# --------------------------------------------------------------------------
423 419
420LIBEV_M4_AVOID_LIBRT=1
421m4_include([libev/libev.m4])
422
423dnl# --------------------------------------------------------------------------
424
424AC_PATH_PROG(TIC, tic, :) 425AC_PATH_PROG(TIC, tic, :)
425
426dnl# need a neat way to detect SVR4 or its features
427dnl# in src/command.c we use these functions:
428dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
429dnl# - but are these also defined for other systems?
430
431dnl# hack to find if this is SVR4 -- who knows?
432dnl## AC_MSG_CHECKING(for SVR4)
433dnl## AC_EGREP_CPP(yes,
434dnl## [#if defined (SVR4) || defined (_SVR4) || defined (__svr4__)
435dnl## yes;
436dnl## #endif
437dnl## ], [AC_MSG_RESULT(yes); AC_DEFINE(PERHAPS_SVR4)], AC_MSG_RESULT(perhaps not?))
438 426
439AC_PATH_XTRA 427AC_PATH_XTRA
440 428
441AFTERIMAGE_CFLAGS= 429AFTERIMAGE_CFLAGS=
442AFTERIMAGE_LIBS= 430AFTERIMAGE_LIBS=
474fi 462fi
475 463
476dnl# -------------------------------------------------------------------------- 464dnl# --------------------------------------------------------------------------
477dnl# CHECKING FOR HEADER FILES 465dnl# CHECKING FOR HEADER FILES
478dnl# -------------------------------------------------------------------------- 466dnl# --------------------------------------------------------------------------
479AC_HEADER_SYS_WAIT
480AC_CHECK_HEADERS( \ 467AC_CHECK_HEADERS( \
481 assert.h \
482 fcntl.h \
483 stdarg.h \
484 stdlib.h \
485 string.h \
486 termios.h \
487 unistd.h \
488 sys/byteorder.h \ 468 sys/byteorder.h \
489 sys/ioctl.h \ 469 sys/ioctl.h \
490 sys/select.h \
491 sys/sockio.h \ 470 sys/sockio.h \
492 sys/strredir.h \ 471 sys/strredir.h \
493 sys/time.h \
494 stdint.h \ 472 stdint.h \
495 wchar.h \ 473 wchar.h \
496 cwchar \ 474 cwchar \
497 clocale \
498) 475)
499
500AC_HEADER_TIME
501
502dnl# check to allow both <termios.h> and <sys/ioctl.h>
503AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
504[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
505#include <sys/ioctl.h>
506#ifdef HAVE_TERMIOS_H
507#include <termios.h>
508#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
509 476
510AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 477AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
511[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])]) 478[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
512if test x$rxvt_cv_xpointer = xyes; then 479if test x$rxvt_cv_xpointer = xyes; then
513 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 480 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
526)]) 493)])
527if test x$rxvt_xlib_illegal_access = xyes; then 494if test x$rxvt_xlib_illegal_access = xyes; then
528 AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it) 495 AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it)
529fi 496fi
530 497
531AC_C_CONST
532AC_C_INLINE
533
534dnl> AC_HEADER_STDC dnl# skip this test, Sun always fails anyhow.
535
536dnl# -------------------------------------------------------------------------- 498dnl# --------------------------------------------------------------------------
537dnl# CHECKING FOR MISSING TYPEDEFS 499dnl# CHECKING FOR MISSING TYPEDEFS
538dnl# -------------------------------------------------------------------------- 500dnl# --------------------------------------------------------------------------
539dnl# Missing typedefs and replacements 501dnl# Missing typedefs and replacements
540AC_TYPE_MODE_T 502AC_TYPE_MODE_T
541dnl> AC_CHECK_TYPE(umode_t, int)
542dnl> AC_CHECK_TYPE(off_t, long)
543AC_TYPE_PID_T 503AC_TYPE_PID_T
544AC_TYPE_UID_T 504AC_TYPE_UID_T
545 505AC_TYPE_INT16_T
546AC_CHECK_SIZEOF(short, 2) 506AC_TYPE_UINT16_T
547AC_CHECK_SIZEOF(int, 4) 507AC_TYPE_INT32_T
548dnl AC_CHECK_SIZEOF(long, 4) 508AC_TYPE_UINT32_T
549AC_CHECK_SIZEOF(long long, 8)
550AC_CHECK_SIZEOF(int *, 4)
551
552dnl# see usage below
553AC_DEFUN([RXVT_CHECK_SIZE],
554 [AC_CACHE_CHECK([for $2], $1,
555 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl
556if test "$ac_cv_sizeof_char" -ge $3; then
557 $1="$4 char"
558else
559 if test "$ac_cv_sizeof_short" -ge $3; then
560 $1="$4 short"
561 else
562 if test "$ac_cv_sizeof_int" -ge $3; then
563 $1="$4 int"
564 else
565 if test "$ac_cv_sizeof_long" -ge $3; then
566 $1="$4 long"
567 else
568 if test "$ac_cv_sizeof_long_long" -ge $3; then
569 $1="$4 long long"
570 else
571 $1="$4 $5" # we _must_ have a (possibly wrong) default
572 fi
573 fi
574 fi
575 fi
576fi])])]
577if test x"$$1" != xyes; then
578 $6="typedef $$1 $2;"
579else
580 if test x"$4" = x; then
581 $6="/* typedef $5 $2; */"
582 else
583 $6="/* typedef $4 $5 $2; */"
584 fi
585fi dnl
586)
587dnl#
588dnl# Look for types the system may know about anyway.
589dnl#
590RXVT_CHECK_SIZE(rxvt_cv_int16_t, int16_t, 2, , short, rxvt_int16_typedef)
591AC_SUBST(rxvt_int16_typedef)
592RXVT_CHECK_SIZE(rxvt_cv_uint16_t, uint16_t, 2, unsigned, short, rxvt_uint16_typedef)
593AC_SUBST(rxvt_uint16_typedef)
594RXVT_CHECK_SIZE(rxvt_cv_int32_t, int32_t, 4, , int, rxvt_int32_typedef)
595AC_SUBST(rxvt_int32_typedef)
596RXVT_CHECK_SIZE(rxvt_cv_uint32_t, uint32_t, 4, unsigned, int, rxvt_uint32_typedef)
597AC_SUBST(rxvt_uint32_typedef)
598dnl RXVT_CHECK_SIZE(rxvt_cv_int64_t, int64_t, 8, , long long, rxvt_int64_typedef)
599dnl AC_SUBST(rxvt_int64_typedef)
600dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
601dnl AC_SUBST(rxvt_uint64_typedef)
602dnl#
603dnl# Now look for another we use
604dnl#
605if test "$ac_cv_sizeof_int_p" -eq 8; then
606 rxvt_intp_define="#define intp_t int64_t"
607 rxvt_u_intp_define="#define u_intp_t u_int64_t"
608else
609 if test "$ac_cv_sizeof_int_p" -eq 4; then
610 rxvt_intp_define="#define intp_t int32_t"
611 rxvt_u_intp_define="#define u_intp_t u_int32_t"
612 else
613 if test "$ac_cv_sizeof_int_p" -eq 2; then
614 rxvt_intp_define="#define intp_t int16_t"
615 rxvt_u_intp_define="#define u_intp_t u_int16_t"
616 else
617 rxvt_intp_define="#error set intp_t"
618 rxvt_u_intp_define="#error set u_intp_t"
619 fi
620 fi
621fi
622AC_SUBST(rxvt_intp_define)
623AC_SUBST(rxvt_u_intp_define)
624 509
625dnl# -------------------------------------------------------------------------- 510dnl# --------------------------------------------------------------------------
626dnl# CHECKING FOR LIBRARY FUNCTIONS 511dnl# CHECKING FOR LIBRARY FUNCTIONS
627dnl# -------------------------------------------------------------------------- 512dnl# --------------------------------------------------------------------------
628AC_TYPE_SIGNAL 513AC_CHECK_FUNCS(unsetenv)
629dnl> AC_FUNC_VPRINTF
630
631AC_CHECK_FUNCS( \
632 unsetenv \
633 setutent \
634 on_exit \
635)
636 514
637UTMP_CHECK 515UTMP_CHECK
638 516
639dnl# -------------------------------------------------------------------------- 517dnl# --------------------------------------------------------------------------
640 518
641dnl# find ttys/ttytab
642AC_CACHE_CHECK(where ttys/ttytab is located, rxvt_cv_path_ttytab,
643[for ttys_file in dnl
644 /etc/ttys /etc/ttytab;
645do
646 if test -f "$ttys_file" ; then
647 rxvt_cv_path_ttytab=$ttys_file
648 break
649 fi
650done
651])
652if test x$rxvt_cv_path_ttytab != x; then
653 AC_DEFINE_UNQUOTED(TTYTAB_FILENAME, "$rxvt_cv_path_ttytab", Define location of ttys/ttytab)
654fi
655
656dnl# -------------------------------------------------------------------------- 519dnl# --------------------------------------------------------------------------
657dnl# -------------------------------------------------------------------------- 520dnl# --------------------------------------------------------------------------
658 521
659dnl# this is a really hack test for some basic Xlocale stuff 522dnl# this is a really hack test for some basic Xlocale stuff
660ac_save_LIBS=$LIBS 523save_LIBS=$LIBS
661ac_save_CFLAGS=$CFLAGS 524save_CFLAGS=$CFLAGS
662CFLAGS="$CFLAGS $X_CFLAGS" 525CFLAGS="$CFLAGS $X_CFLAGS"
663LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 526LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
664if test x$support_xim = xyes; then 527if test x$support_xim = xyes; then
665 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 528 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
666 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 529 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
697[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 560[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
698#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) 561#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
699if test x$rxvt_cv_func_xsetlocale = xyes; then 562if test x$rxvt_cv_func_xsetlocale = xyes; then
700 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 563 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
701fi 564fi
702LIBS=$ac_save_LIBS 565LIBS=$save_LIBS
703CFLAGS=$ac_save_CFLAGS 566CFLAGS=$save_CFLAGS
704 567
705AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale, 568AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
706[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])]) 569[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])
707if test x$rxvt_cv_func_setlocale = xyes; then 570if test x$rxvt_cv_func_setlocale = xyes; then
708 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works) 571 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
724dnl# now add and remove other stuff 587dnl# now add and remove other stuff
725dnl# -------------------------------------------------------------------------- 588dnl# --------------------------------------------------------------------------
726if test x$support_xft = xyes; then 589if test x$support_xft = xyes; then
727 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 590 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
728 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 591 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
729 LIBS="$LIBS `$PKG_CONFIG xft --libs`" 592 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
730 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 593 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
731 else 594 else
732 AC_PATH_PROG(XFT_CONFIG, xft-config, no) 595 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
733 if test $XFT_CONFIG != no; then 596 if test $XFT_CONFIG != no; then
734 LIBS="$LIBS `$XFT_CONFIG --libs`" 597 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
735 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 598 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
736 fi 599 fi
737 fi 600 fi
738 601
602 save_LIBS="$LIBS"
603 LIBS="$LIBS $X_LIBS"
739 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 604 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
740 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no]) 605 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
606 LIBS="$save_LIBS"
741 607
742 if test x$support_xft = xyes; then 608 if test x$support_xft = xyes; then
743 AC_DEFINE(XFT, 1, Define to enable xft support) 609 AC_DEFINE(XFT, 1, Define to enable xft support)
744 fi 610 fi
745fi 611fi
835 701
836 save_CXXFLAGS="$CXXFLAGS" 702 save_CXXFLAGS="$CXXFLAGS"
837 save_LIBS="$LIBS" 703 save_LIBS="$LIBS"
838 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`" 704 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`"
839 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`" 705 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
840 AC_TRY_LINK([ 706 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
841#include <EXTERN.h> 707#include <EXTERN.h>
842#include <perl.h> 708#include <perl.h>
843#include <XSUB.h> 709#include <XSUB.h>
844],[ 710]], [[
845 PerlInterpreter *perl = perl_alloc (); 711 PerlInterpreter *perl = perl_alloc ();
846],[rxvt_perl_link=yes],[rxvt_perl_link=no]) 712]])],[rxvt_perl_link=yes],[rxvt_perl_link=no])
847 CXXFLAGS="$save_CXXFLAGS" 713 CXXFLAGS="$save_CXXFLAGS"
848 LIBS="$save_LIBS" 714 LIBS="$save_LIBS"
849 715
850 if test x$rxvt_perl_link = xyes; then 716 if test x$rxvt_perl_link = xyes; then
851 AC_MSG_RESULT(ok) 717 AC_MSG_RESULT(ok)
882AC_SUBST(AFTERIMAGE_CFLAGS) 748AC_SUBST(AFTERIMAGE_CFLAGS)
883AC_SUBST(AFTERIMAGE_LIBS) 749AC_SUBST(AFTERIMAGE_LIBS)
884 750
885AC_ARG_PROGRAM 751AC_ARG_PROGRAM
886 752
887dnl# test for "sun" or "__sun__" before include sys_ioctl
888
889dnl# revert HAVE_BLAH_H into a "#include <blah.h>"
890AC_DEFUN([RXVT_DEFINE_TO_INCLUDE], dnl
891[if test "$$3" = "$4" -o "$$5" = "$6"; then
892 $1="#include <$2>"
893else
894 $1="/* #include <$2> */"
895fi dnl
896AC_SUBST($1)])
897
898RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch)
899RXVT_DEFINE_TO_INCLUDE(include_stdarg_h, cstdarg, ac_cv_header_stdarg_h, yes, notset, dontmatch)
900RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, cstdlib, ac_cv_header_stdlib_h, yes, notset, dontmatch)
901RXVT_DEFINE_TO_INCLUDE(include_unistd_h, unistd.h, ac_cv_header_unistd_h, yes, notset, dontmatch)
902RXVT_DEFINE_TO_INCLUDE(include_string_h, cstring, ac_cv_header_string_h, yes, notset, dontmatch)
903RXVT_DEFINE_TO_INCLUDE(include_fcntl_h, fcntl.h, ac_cv_header_fcntl_h, yes, notset, dontmatch)
904RXVT_DEFINE_TO_INCLUDE(include_util_h, util.h, ac_cv_header_util_h, yes, notset, dontmatch)
905RXVT_DEFINE_TO_INCLUDE(include_assert_h, assert.h, ac_cv_header_assert_h, yes, notset, dontmatch)
906RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch)
907RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch)
908RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
909RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)
910RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
911
912AC_CONFIG_FILES([Makefile \ 753AC_CONFIG_FILES([Makefile \
913doc/Makefile \ 754doc/Makefile \
914src/Makefile \ 755src/Makefile \
915src/rxvtlib.h \
916]) 756])
917AC_OUTPUT 757AC_OUTPUT
918 758
919echo "Configuration: 759echo "Configuration:
920 760

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines