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.78 by ayin, Wed Oct 31 11:55:23 2007 UTC vs.
Revision 1.97 by ayin, Tue Dec 11 18:07:08 2007 UTC

… …
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` 16dnl LIBVERSION=`sed -n -e 's/^.*[ \t]LIBVERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
17changequote([, ])dnl 17changequote([, ])dnl
18AC_SUBST(VERSION)dnl 18AC_SUBST(VERSION)dnl
19AC_SUBST(DATE)dnl 19AC_SUBST(DATE)dnl
20AC_SUBST(LSMDATE)dnl
21AC_SUBST(LIBVERSION)dnl 20dnl AC_SUBST(LIBVERSION)dnl
21
22echo "" 22echo ""
23echo "configuring for rxvt $VERSION" 23echo "configuring for rxvt $VERSION"
24echo "" 24echo ""
25 25
26orig_CXXFLAGS="$CXXFLAGS" 26orig_CXXFLAGS="$CXXFLAGS"
27 27
28dnl# Checks for programs. 28dnl# Checks for programs.
29dnl AC_MAKE_SET
30
31AC_PROG_CC 29AC_PROG_CC
32AC_PROG_CXX 30AC_PROG_CXX
33AC_PROG_CPP 31AC_PROG_CPP
34AC_PROG_INSTALL 32AC_PROG_INSTALL
35 33
36AC_AIX 34AC_AIX
35AC_GNU_SOURCE
37AC_ISC_POSIX 36AC_ISC_POSIX
38AC_LANG(C++) 37AC_LANG(C++)
39 38
40dnl check wether we can link with gcc -lsupc++ 39dnl check wether we can link with gcc -lsupc++
41if test x$GCC = xyes && test x$GXX = xyes; then 40if test x$GCC = xyes && test x$GXX = xyes; then
… …
62dnl# -------------------------------------------------------------------------- 61dnl# --------------------------------------------------------------------------
63dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' 62dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
64dnl# 63dnl#
65if test -z "$orig_CXXFLAGS"; then 64if test -z "$orig_CXXFLAGS"; then
66 if test x$GCC = xyes && test "x$GXX" = xyes; then 65 if test x$GCC = xyes && test "x$GXX" = xyes; then
67 CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs" 66 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"]) 67 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"])
69 else 68 else
70 CXXFLAGS="-O" 69 CXXFLAGS="-O"
71 fi 70 fi
72 CFLAGS="$CXXFLAGS" 71 CFLAGS="$CXXFLAGS"
73fi 72fi
74 73
75AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)
76
77case $host in 74case $host in
78 *-*-solaris* ) 75 *-*-solaris* )
79 AC_DEFINE(_XOPEN_SOURCE, 500, Needed to get declarations for msg_control and msg_controllen on Solaris) 76 AC_DEFINE(_XOPEN_SOURCE, 500, Needed to get declarations for msg_control and msg_controllen on Solaris)
80 ;; 77 ;;
81esac 78esac
82
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 79
87dnl# FreeBSD needs to link libxpg4 80dnl# FreeBSD needs to link libxpg4
88AC_CHECK_FUNC(setlocale, [], [AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])]) 81AC_CHECK_FUNC(setlocale, [], [AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])])
89 82
90dnl# solaris needs to link libnsl and socket 83dnl# solaris needs to link libnsl and socket
… …
122 115
123dnl# -------------------------------------------------------------------------- 116dnl# --------------------------------------------------------------------------
124dnl# CHECKING COMMAND LINE OPTIONS 117dnl# CHECKING COMMAND LINE OPTIONS
125dnl# -------------------------------------------------------------------------- 118dnl# --------------------------------------------------------------------------
126 119
127if test "x$enable_shared" = xyes; then 120dnl if test "x$enable_shared" = xyes; then
128 AC_DEFINE(LIBRXVT, 1, Build shared library version - specify via configure only) 121dnl AC_DEFINE(LIBRXVT, 1, Build shared library version - specify via configure only)
129 INSTALL_LIBRXVT=yes 122dnl INSTALL_LIBRXVT=yes
130fi 123dnl fi
131AC_SUBST(INSTALL_LIBRXVT) 124dnl AC_SUBST(INSTALL_LIBRXVT)
132 125
133AC_ARG_ENABLE(everything, 126AC_ARG_ENABLE(everything,
134 [ --enable-everything enable standard non-multichoice features 127 [ --enable-everything enable standard non-multichoice features
135 NOTE: this option is order dependent 128 NOTE: this option is order dependent],
136 NOTE: automatically enabled with --enable-shared],
137 [ 129 [
138 if test x$enableval = xno; then 130 if test x$enableval = xno; then
139 support_frills=no 131 support_frills=no
140 support_inheritpixmap=no 132 support_inheritpixmap=no
141 support_fading=no 133 support_fading=no
… …
281 [ --enable-xterm-scroll enable Xterm style scrollbar], 273 [ --enable-xterm-scroll enable Xterm style scrollbar],
282 [if test x$enableval = xyes -o x$enableval = xno; then 274 [if test x$enableval = xyes -o x$enableval = xno; then
283 support_scroll_xterm=$enableval 275 support_scroll_xterm=$enableval
284 fi]) 276 fi])
285 277
278AC_ARG_ENABLE(plain-scroll,
279 [ --enable-plain-scroll enable plain style scrollbar],
280 [if test x$enableval = xyes -o x$enableval = xno; then
281 support_scroll_plain=$enableval
282 fi])
283
286AC_ARG_ENABLE(perl, 284AC_ARG_ENABLE(perl,
287 [ --enable-perl enable embedded perl interpreter], 285 [ --enable-perl enable embedded perl interpreter],
288 [if test x$enableval = xyes -o x$enableval = xno; then 286 [if test x$enableval = xyes -o x$enableval = xno; then
289 support_perl=$enableval 287 support_perl=$enableval
290 fi]) 288 fi])
291 289
292AC_ARG_ENABLE(plain-scroll,
293 [ --enable-plain-scroll enable plain style scrollbar],
294 [if test x$enableval = xyes -o x$enableval = xno; then
295 support_scroll_plain=$enableval
296 fi])
297
298AC_ARG_WITH(codesets, 290AC_ARG_WITH(codesets,
299 [ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)], 291 [ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
300 [codesets="$withval"]) 292 [codesets="$withval"])
301 293
302AC_ARG_ENABLE(xim, 294AC_ARG_ENABLE(xim,
303 [ --enable-xim XIM (X Input Method) protocol support], 295 [ --enable-xim XIM (X Input Method) protocol support],
304 [if test x$enableval = xyes -o x$enableval = xno; then 296 [if test x$enableval = xyes -o x$enableval = xno; then
… …
435 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" 427 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
436 fi]) 428 fi])
437 429
438dnl# -------------------------------------------------------------------------- 430dnl# --------------------------------------------------------------------------
439 431
432LIBEV_M4_AVOID_LIBRT=1
433m4_include([libev/libev.m4])
434
435dnl# --------------------------------------------------------------------------
436
440AC_PATH_PROG(TIC, tic, :) 437AC_PATH_PROG(TIC, tic, :)
441
442dnl# need a neat way to detect SVR4 or its features
443dnl# in src/command.c we use these functions:
444dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
445dnl# - but are these also defined for other systems?
446
447dnl# hack to find if this is SVR4 -- who knows?
448dnl## AC_MSG_CHECKING(for SVR4)
449dnl## AC_EGREP_CPP(yes,
450dnl## [#if defined (SVR4) || defined (_SVR4) || defined (__svr4__)
451dnl## yes;
452dnl## #endif
453dnl## ], [AC_MSG_RESULT(yes); AC_DEFINE(PERHAPS_SVR4)], AC_MSG_RESULT(perhaps not?))
454 438
455AC_PATH_XTRA 439AC_PATH_XTRA
456 440
457AFTERIMAGE_CFLAGS= 441AFTERIMAGE_CFLAGS=
458AFTERIMAGE_LIBS= 442AFTERIMAGE_LIBS=
… …
490fi 474fi
491 475
492dnl# -------------------------------------------------------------------------- 476dnl# --------------------------------------------------------------------------
493dnl# CHECKING FOR HEADER FILES 477dnl# CHECKING FOR HEADER FILES
494dnl# -------------------------------------------------------------------------- 478dnl# --------------------------------------------------------------------------
495AC_HEADER_SYS_WAIT
496AC_CHECK_HEADERS( \ 479AC_CHECK_HEADERS( \
497 assert.h \
498 fcntl.h \
499 stdarg.h \
500 stdlib.h \
501 string.h \
502 termios.h \
503 unistd.h \
504 sys/byteorder.h \ 480 sys/byteorder.h \
505 sys/ioctl.h \ 481 sys/ioctl.h \
506 sys/select.h \
507 sys/sockio.h \ 482 sys/sockio.h \
508 sys/strredir.h \ 483 sys/strredir.h \
509 sys/time.h \
510 stdint.h \ 484 stdint.h \
511 wchar.h \ 485 wchar.h \
512 cwchar \ 486 cwchar \
513 clocale \ 487 clocale \
514) 488)
515 489
516AC_HEADER_TIME
517
518dnl# check to allow both <termios.h> and <sys/ioctl.h> 490dnl# check to allow both <termios.h> and <sys/ioctl.h>
519AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl, 491AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
520[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> 492[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
521#include <sys/ioctl.h> 493#include <sys/ioctl.h>
522#ifdef HAVE_TERMIOS_H
523#include <termios.h> 494#include <termios.h>
524#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])]) 495]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
525 496
526AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 497AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
527[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])]) 498[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
528if test x$rxvt_cv_xpointer = xyes; then 499if test x$rxvt_cv_xpointer = xyes; then
529 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 500 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
… …
542)]) 513)])
543if test x$rxvt_xlib_illegal_access = xyes; then 514if test x$rxvt_xlib_illegal_access = xyes; then
544 AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it) 515 AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it)
545fi 516fi
546 517
547AC_C_CONST
548AC_C_INLINE
549
550dnl> AC_HEADER_STDC dnl# skip this test, Sun always fails anyhow.
551
552dnl# -------------------------------------------------------------------------- 518dnl# --------------------------------------------------------------------------
553dnl# CHECKING FOR MISSING TYPEDEFS 519dnl# CHECKING FOR MISSING TYPEDEFS
554dnl# -------------------------------------------------------------------------- 520dnl# --------------------------------------------------------------------------
555dnl# Missing typedefs and replacements 521dnl# Missing typedefs and replacements
556AC_TYPE_MODE_T 522AC_TYPE_MODE_T
… …
563AC_CHECK_SIZEOF(int, 4) 529AC_CHECK_SIZEOF(int, 4)
564dnl AC_CHECK_SIZEOF(long, 4) 530dnl AC_CHECK_SIZEOF(long, 4)
565AC_CHECK_SIZEOF(long long, 8) 531AC_CHECK_SIZEOF(long long, 8)
566AC_CHECK_SIZEOF(int *, 4) 532AC_CHECK_SIZEOF(int *, 4)
567 533
568dnl# see usage below 534AC_TYPE_INT16_T
569AC_DEFUN([RXVT_CHECK_SIZE], 535AC_TYPE_UINT16_T
570 [AC_CACHE_CHECK([for $2], $1, 536AC_TYPE_INT32_T
571 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl 537AC_TYPE_UINT32_T
572if test "$ac_cv_sizeof_char" -ge $3; then
573 $1="$4 char"
574else
575 if test "$ac_cv_sizeof_short" -ge $3; then
576 $1="$4 short"
577 else
578 if test "$ac_cv_sizeof_int" -ge $3; then
579 $1="$4 int"
580 else
581 if test "$ac_cv_sizeof_long" -ge $3; then
582 $1="$4 long"
583 else
584 if test "$ac_cv_sizeof_long_long" -ge $3; then
585 $1="$4 long long"
586 else
587 $1="$4 $5" # we _must_ have a (possibly wrong) default
588 fi
589 fi
590 fi
591 fi
592fi])])]
593if test x"$$1" != xyes; then
594 $6="typedef $$1 $2;"
595else
596 if test x"$4" = x; then
597 $6="/* typedef $5 $2; */"
598 else
599 $6="/* typedef $4 $5 $2; */"
600 fi
601fi dnl
602)
603dnl#
604dnl# Look for types the system may know about anyway.
605dnl#
606RXVT_CHECK_SIZE(rxvt_cv_int16_t, int16_t, 2, , short, rxvt_int16_typedef)
607AC_SUBST(rxvt_int16_typedef)
608RXVT_CHECK_SIZE(rxvt_cv_uint16_t, uint16_t, 2, unsigned, short, rxvt_uint16_typedef)
609AC_SUBST(rxvt_uint16_typedef)
610RXVT_CHECK_SIZE(rxvt_cv_int32_t, int32_t, 4, , int, rxvt_int32_typedef)
611AC_SUBST(rxvt_int32_typedef)
612RXVT_CHECK_SIZE(rxvt_cv_uint32_t, uint32_t, 4, unsigned, int, rxvt_uint32_typedef)
613AC_SUBST(rxvt_uint32_typedef)
614dnl RXVT_CHECK_SIZE(rxvt_cv_int64_t, int64_t, 8, , long long, rxvt_int64_typedef)
615dnl AC_SUBST(rxvt_int64_typedef)
616dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
617dnl AC_SUBST(rxvt_uint64_typedef)
618dnl#
619dnl# Now look for another we use
620dnl#
621if test "$ac_cv_sizeof_int_p" -eq 8; then
622 rxvt_intp_define="#define intp_t int64_t"
623 rxvt_u_intp_define="#define u_intp_t u_int64_t"
624else
625 if test "$ac_cv_sizeof_int_p" -eq 4; then
626 rxvt_intp_define="#define intp_t int32_t"
627 rxvt_u_intp_define="#define u_intp_t u_int32_t"
628 else
629 if test "$ac_cv_sizeof_int_p" -eq 2; then
630 rxvt_intp_define="#define intp_t int16_t"
631 rxvt_u_intp_define="#define u_intp_t u_int16_t"
632 else
633 rxvt_intp_define="#error set intp_t"
634 rxvt_u_intp_define="#error set u_intp_t"
635 fi
636 fi
637fi
638AC_SUBST(rxvt_intp_define)
639AC_SUBST(rxvt_u_intp_define)
640 538
641dnl# -------------------------------------------------------------------------- 539dnl# --------------------------------------------------------------------------
642dnl# CHECKING FOR LIBRARY FUNCTIONS 540dnl# CHECKING FOR LIBRARY FUNCTIONS
643dnl# -------------------------------------------------------------------------- 541dnl# --------------------------------------------------------------------------
644AC_TYPE_SIGNAL 542AC_CHECK_FUNCS(unsetenv)
645dnl> AC_FUNC_VPRINTF
646
647AC_CHECK_FUNCS( \
648 unsetenv \
649 setutent \
650 on_exit \
651)
652 543
653UTMP_CHECK 544UTMP_CHECK
654 545
655dnl# -------------------------------------------------------------------------- 546dnl# --------------------------------------------------------------------------
656 547
657dnl# find ttys/ttytab
658AC_CACHE_CHECK(where ttys/ttytab is located, rxvt_cv_path_ttytab,
659[for ttys_file in dnl
660 /etc/ttys /etc/ttytab;
661do
662 if test -f "$ttys_file" ; then
663 rxvt_cv_path_ttytab=$ttys_file
664 break
665 fi
666done
667])
668if test x$rxvt_cv_path_ttytab != x; then
669 AC_DEFINE_UNQUOTED(TTYTAB_FILENAME, "$rxvt_cv_path_ttytab", Define location of ttys/ttytab)
670fi
671
672dnl# -------------------------------------------------------------------------- 548dnl# --------------------------------------------------------------------------
673dnl# -------------------------------------------------------------------------- 549dnl# --------------------------------------------------------------------------
674 550
675dnl# this is a really hack test for some basic Xlocale stuff 551dnl# this is a really hack test for some basic Xlocale stuff
676ac_save_LIBS=$LIBS 552save_LIBS=$LIBS
677ac_save_CFLAGS=$CFLAGS 553save_CFLAGS=$CFLAGS
678CFLAGS="$CFLAGS $X_CFLAGS" 554CFLAGS="$CFLAGS $X_CFLAGS"
679LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 555LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
680if test x$support_xim = xyes; then 556if test x$support_xim = xyes; then
681 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 557 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
682 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 558 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
… …
713[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 589[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
714#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) 590#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
715if test x$rxvt_cv_func_xsetlocale = xyes; then 591if test x$rxvt_cv_func_xsetlocale = xyes; then
716 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 592 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
717fi 593fi
718LIBS=$ac_save_LIBS 594LIBS=$save_LIBS
719CFLAGS=$ac_save_CFLAGS 595CFLAGS=$save_CFLAGS
720 596
721AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale, 597AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
722[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])]) 598[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])
723if test x$rxvt_cv_func_setlocale = xyes; then 599if test x$rxvt_cv_func_setlocale = xyes; then
724 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works) 600 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
… …
740dnl# now add and remove other stuff 616dnl# now add and remove other stuff
741dnl# -------------------------------------------------------------------------- 617dnl# --------------------------------------------------------------------------
742if test x$support_xft = xyes; then 618if test x$support_xft = xyes; then
743 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 619 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
744 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 620 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
745 LIBS="$LIBS `$PKG_CONFIG xft --libs`" 621 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
746 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 622 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
747 else 623 else
748 AC_PATH_PROG(XFT_CONFIG, xft-config, no) 624 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
749 if test $XFT_CONFIG != no; then 625 if test $XFT_CONFIG != no; then
750 LIBS="$LIBS `$XFT_CONFIG --libs`" 626 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
751 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 627 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
752 fi 628 fi
753 fi 629 fi
754 630
631 save_LIBS="$LIBS"
632 LIBS="$LIBS $X_LIBS"
755 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 633 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
756 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no]) 634 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
635 LIBS="$save_LIBS"
757 636
758 if test x$support_xft = xyes; then 637 if test x$support_xft = xyes; then
759 AC_DEFINE(XFT, 1, Define to enable xft support) 638 AC_DEFINE(XFT, 1, Define to enable xft support)
760 fi 639 fi
761fi 640fi
… …
910 $1="/* #include <$2> */" 789 $1="/* #include <$2> */"
911fi dnl 790fi dnl
912AC_SUBST($1)]) 791AC_SUBST($1)])
913 792
914RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch) 793RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch)
915RXVT_DEFINE_TO_INCLUDE(include_stdarg_h, cstdarg, ac_cv_header_stdarg_h, yes, notset, dontmatch)
916RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, cstdlib, ac_cv_header_stdlib_h, yes, notset, dontmatch)
917RXVT_DEFINE_TO_INCLUDE(include_unistd_h, unistd.h, ac_cv_header_unistd_h, yes, notset, dontmatch)
918RXVT_DEFINE_TO_INCLUDE(include_string_h, cstring, ac_cv_header_string_h, yes, notset, dontmatch)
919RXVT_DEFINE_TO_INCLUDE(include_fcntl_h, fcntl.h, ac_cv_header_fcntl_h, yes, notset, dontmatch)
920RXVT_DEFINE_TO_INCLUDE(include_util_h, util.h, ac_cv_header_util_h, yes, notset, dontmatch)
921RXVT_DEFINE_TO_INCLUDE(include_assert_h, assert.h, ac_cv_header_assert_h, yes, notset, dontmatch)
922RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch) 794RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch)
923RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch)
924RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch) 795RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
925RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)
926RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
927 796
928AC_CONFIG_FILES([Makefile \ 797AC_CONFIG_FILES([Makefile \
929doc/Makefile \ 798doc/Makefile \
930src/Makefile \ 799src/Makefile \
931src/rxvtlib.h \ 800src/rxvtlib.h \

Diff Legend

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