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.72 by ayin, Fri Aug 3 23:32:14 2007 UTC vs.
Revision 1.90 by ayin, Mon Dec 10 23:41:15 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
75AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)
76 73
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 ;;
… …
122 119
123dnl# -------------------------------------------------------------------------- 120dnl# --------------------------------------------------------------------------
124dnl# CHECKING COMMAND LINE OPTIONS 121dnl# CHECKING COMMAND LINE OPTIONS
125dnl# -------------------------------------------------------------------------- 122dnl# --------------------------------------------------------------------------
126 123
127if test "x$enable_shared" = xyes; then 124dnl if test "x$enable_shared" = xyes; then
128 AC_DEFINE(LIBRXVT, 1, Build shared library version - specify via configure only) 125dnl AC_DEFINE(LIBRXVT, 1, Build shared library version - specify via configure only)
129 INSTALL_LIBRXVT=yes 126dnl INSTALL_LIBRXVT=yes
130fi 127dnl fi
131AC_SUBST(INSTALL_LIBRXVT) 128dnl AC_SUBST(INSTALL_LIBRXVT)
132 129
133AC_ARG_ENABLE(everything, 130AC_ARG_ENABLE(everything,
134 [ --enable-everything enable standard non-multichoice features 131 [ --enable-everything enable standard non-multichoice features
135 NOTE: this option is order dependent 132 NOTE: this option is order dependent],
136 NOTE: automatically enabled with --enable-shared],
137 [ 133 [
138 if test x$enableval = xno; then 134 if test x$enableval = xno; then
139 support_frills=no 135 support_frills=no
140 support_inheritpixmap=no 136 support_inheritpixmap=no
141 support_fading=no 137 support_fading=no
… …
193 support_perl=yes 189 support_perl=yes
194 codesets=all 190 codesets=all
195 fi 191 fi
196 ]) 192 ])
197 193
194WARNINGS=no
195AC_ARG_ENABLE(warnings,
196 [ --enable-warnings turn on g++ warnings],
197 [if test x$enableval = xyes; then
198 WARNINGS=yes
199 fi])
200if test x$GXX = xyes; then
201 if test $WARNINGS = yes; then
202 save_CXXFLAGS="$CXXFLAGS"
203 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor"
204 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"])
205 else
206 CXXFLAGS="$CXXFLAGS -w"
207 fi
208fi
209
198AC_ARG_ENABLE(unicode3, 210AC_ARG_ENABLE(unicode3,
199 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters], 211 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters],
200 [if test x$enableval = xyes -o x$enableval = xno; then 212 [if test x$enableval = xyes -o x$enableval = xno; then
201 support_unicode3=$enableval 213 support_unicode3=$enableval
202 fi]) 214 fi])
… …
265 [ --enable-xterm-scroll enable Xterm style scrollbar], 277 [ --enable-xterm-scroll enable Xterm style scrollbar],
266 [if test x$enableval = xyes -o x$enableval = xno; then 278 [if test x$enableval = xyes -o x$enableval = xno; then
267 support_scroll_xterm=$enableval 279 support_scroll_xterm=$enableval
268 fi]) 280 fi])
269 281
282AC_ARG_ENABLE(plain-scroll,
283 [ --enable-plain-scroll enable plain style scrollbar],
284 [if test x$enableval = xyes -o x$enableval = xno; then
285 support_scroll_plain=$enableval
286 fi])
287
270AC_ARG_ENABLE(perl, 288AC_ARG_ENABLE(perl,
271 [ --enable-perl enable embedded perl interpreter], 289 [ --enable-perl enable embedded perl interpreter],
272 [if test x$enableval = xyes -o x$enableval = xno; then 290 [if test x$enableval = xyes -o x$enableval = xno; then
273 support_perl=$enableval 291 support_perl=$enableval
274 fi]) 292 fi])
275 293
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, 294AC_ARG_WITH(codesets,
283 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)], 295 [ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
284 [codesets="$withval"]) 296 [codesets="$withval"])
285 297
286AC_ARG_ENABLE(xim, 298AC_ARG_ENABLE(xim,
287 [ --enable-xim XIM (X Input Method) protocol support], 299 [ --enable-xim XIM (X Input Method) protocol support],
288 [if test x$enableval = xyes -o x$enableval = xno; then 300 [if test x$enableval = xyes -o x$enableval = xno; then
… …
313 support_8bitctrls=$enableval 325 support_8bitctrls=$enableval
314 fi]) 326 fi])
315 327
316RESFALLBACK=Rxvt 328RESFALLBACK=Rxvt
317AC_ARG_ENABLE(fallback, 329AC_ARG_ENABLE(fallback,
318 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)], 330 [ --enable-fallback@<:@=CLASS@:>@ fall back on CLASS resources in addition to URxvt ones (default: Rxvt)],
319 [ 331 [
320 test x$enableval = xyes && enableval=Rxvt 332 test x$enableval = xyes && enableval=Rxvt
321 test x$enableval = xno && enableval= 333 test x$enableval = xno && enableval=
322 RESFALLBACK="$enableval" 334 RESFALLBACK="$enableval"
323 ]) 335 ])
… …
382 [if test x$enableval = xyes -o x$enableval = xno; then 394 [if test x$enableval = xyes -o x$enableval = xno; then
383 support_mousewheel=$enableval 395 support_mousewheel=$enableval
384 fi]) 396 fi])
385 397
386AC_ARG_ENABLE(slipwheeling, 398AC_ARG_ENABLE(slipwheeling,
387 [ --enable-slipwheeling enable slip wheel scrolling (requires previous)], 399 [ --enable-slipwheeling enable slip wheel scrolling (requires --enable-mousewheel)],
388 [if test x$enableval = xyes -o x$enableval = xno; then 400 [if test x$enableval = xyes -o x$enableval = xno; then
389 support_mouseslipwheel=$enableval 401 support_mouseslipwheel=$enableval
390 fi]) 402 fi])
391 403
392AC_ARG_ENABLE(smart-resize, 404AC_ARG_ENABLE(smart-resize,
… …
419 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" 431 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
420 fi]) 432 fi])
421 433
422dnl# -------------------------------------------------------------------------- 434dnl# --------------------------------------------------------------------------
423 435
436LIBEV_M4_AVOID_LIBRT=1
437m4_include([libev/libev.m4])
438
439dnl# --------------------------------------------------------------------------
440
424AC_PATH_PROG(TIC, tic) 441AC_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 442
439AC_PATH_XTRA 443AC_PATH_XTRA
440 444
441AFTERIMAGE_CFLAGS= 445AFTERIMAGE_CFLAGS=
442AFTERIMAGE_LIBS= 446AFTERIMAGE_LIBS=
… …
474fi 478fi
475 479
476dnl# -------------------------------------------------------------------------- 480dnl# --------------------------------------------------------------------------
477dnl# CHECKING FOR HEADER FILES 481dnl# CHECKING FOR HEADER FILES
478dnl# -------------------------------------------------------------------------- 482dnl# --------------------------------------------------------------------------
479AC_HEADER_SYS_WAIT
480AC_CHECK_HEADERS( \ 483AC_CHECK_HEADERS( \
481 assert.h \ 484 assert.h \
482 fcntl.h \ 485 fcntl.h \
483 stdarg.h \ 486 stdarg.h \
484 stdlib.h \ 487 stdlib.h \
… …
495 wchar.h \ 498 wchar.h \
496 cwchar \ 499 cwchar \
497 clocale \ 500 clocale \
498) 501)
499 502
500AC_HEADER_TIME
501
502dnl# check to allow both <termios.h> and <sys/ioctl.h> 503dnl# 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, 504AC_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[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
505#include <sys/ioctl.h> 506#include <sys/ioctl.h>
506#ifdef HAVE_TERMIOS_H 507#ifdef HAVE_TERMIOS_H
… …
525 [rxvt_xlib_illegal_access=yes],[rxvt_xlib_illegal_access=no] 526 [rxvt_xlib_illegal_access=yes],[rxvt_xlib_illegal_access=no]
526)]) 527)])
527if test x$rxvt_xlib_illegal_access = xyes; then 528if test x$rxvt_xlib_illegal_access = xyes; then
528 AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it) 529 AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it)
529fi 530fi
530
531AC_C_CONST
532AC_C_INLINE
533
534dnl> AC_HEADER_STDC dnl# skip this test, Sun always fails anyhow.
535 531
536dnl# -------------------------------------------------------------------------- 532dnl# --------------------------------------------------------------------------
537dnl# CHECKING FOR MISSING TYPEDEFS 533dnl# CHECKING FOR MISSING TYPEDEFS
538dnl# -------------------------------------------------------------------------- 534dnl# --------------------------------------------------------------------------
539dnl# Missing typedefs and replacements 535dnl# Missing typedefs and replacements
… …
623AC_SUBST(rxvt_u_intp_define) 619AC_SUBST(rxvt_u_intp_define)
624 620
625dnl# -------------------------------------------------------------------------- 621dnl# --------------------------------------------------------------------------
626dnl# CHECKING FOR LIBRARY FUNCTIONS 622dnl# CHECKING FOR LIBRARY FUNCTIONS
627dnl# -------------------------------------------------------------------------- 623dnl# --------------------------------------------------------------------------
628AC_TYPE_SIGNAL 624AC_CHECK_FUNCS(unsetenv)
629dnl> AC_FUNC_VPRINTF
630
631AC_CHECK_FUNCS( \
632 unsetenv \
633 setutent \
634 on_exit \
635)
636 625
637UTMP_CHECK 626UTMP_CHECK
638 627
639dnl# -------------------------------------------------------------------------- 628dnl# --------------------------------------------------------------------------
640 629
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# -------------------------------------------------------------------------- 630dnl# --------------------------------------------------------------------------
657dnl# -------------------------------------------------------------------------- 631dnl# --------------------------------------------------------------------------
658 632
659dnl# this is a really hack test for some basic Xlocale stuff 633dnl# this is a really hack test for some basic Xlocale stuff
660ac_save_LIBS=$LIBS 634save_LIBS=$LIBS
661ac_save_CFLAGS=$CFLAGS 635save_CFLAGS=$CFLAGS
662CFLAGS="$CFLAGS $X_CFLAGS" 636CFLAGS="$CFLAGS $X_CFLAGS"
663LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 637LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
664AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
665[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
666#include <stdlib.h>
667main() {
668char *p;
669if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
670exit (XSupportsLocale() ? 0 : 1);
671else
672exit (1);}]])],[dnl
673 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
674 :])])
675if test x$support_xim = xyes; then 638if test x$support_xim = xyes; then
639 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
640 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
641 #include <stdlib.h>
642 main() {
643 char *p;
644 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
645 exit (XSupportsLocale() ? 0 : 1);
646 else
647 exit (1);}]])],[dnl
648 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
649 :])])
676 if test x$rxvt_cv_func_xlocale = xyes; then 650 if test x$rxvt_cv_func_xlocale = xyes; then
677 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input) 651 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
652 AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
653 [AC_COMPILE_IFELSE([
654 #include <X11/Xlib.h>
655
656 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
657
658 void f() {
659 XIMCallback cb;
660 cb.callback = im_destroy_cb;
661 }
662 ],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)])
663
664 if test x$rxvt_broken_ximcb = xyes; then
665 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
666 fi
678 fi 667 fi
679fi 668fi
680 669
681AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, 670AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
682[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 671[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
683#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) 672#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
684if test x$rxvt_cv_func_xsetlocale = xyes; then 673if test x$rxvt_cv_func_xsetlocale = xyes; then
685 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 674 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
686fi 675fi
687LIBS=$ac_save_LIBS 676LIBS=$save_LIBS
688CFLAGS=$ac_save_CFLAGS 677CFLAGS=$save_CFLAGS
689 678
690AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale, 679AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
691[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])]) 680[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])
692if test x$rxvt_cv_func_setlocale = xyes; then 681if test x$rxvt_cv_func_setlocale = xyes; then
693 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works) 682 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
… …
699 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) 688 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
700fi 689fi
701 690
702SCM_RIGHTS_CHECK 691SCM_RIGHTS_CHECK
703 692
704AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
705[AC_COMPILE_IFELSE([
706#include <X11/Xlib.h>
707
708void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
709
710void f() {
711 XIMCallback cb;
712 cb.callback = im_destroy_cb;
713}
714],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)])
715
716if test x$rxvt_broken_ximcb = xyes; then
717 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
718fi
719
720PTY_CHECK 693PTY_CHECK
721 694
722TTY_GROUP_CHECK 695TTY_GROUP_CHECK
723 696
724dnl# -------------------------------------------------------------------------- 697dnl# --------------------------------------------------------------------------
725dnl# now add and remove other stuff 698dnl# now add and remove other stuff
726dnl# -------------------------------------------------------------------------- 699dnl# --------------------------------------------------------------------------
727if test x$support_xft = xyes; then 700if test x$support_xft = xyes; then
728 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 701 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
729 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 702 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
730 LIBS="$LIBS `$PKG_CONFIG xft --libs`" 703 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
731 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 704 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
732 else 705 else
733 AC_PATH_PROG(XFT_CONFIG, xft-config, no) 706 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
734 if test $XFT_CONFIG != no; then 707 if test $XFT_CONFIG != no; then
735 LIBS="$LIBS `$XFT_CONFIG --libs`" 708 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
736 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 709 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
737 fi 710 fi
738 fi 711 fi
739 712
713 save_LIBS="$LIBS"
714 LIBS="$LIBS $X_LIBS"
740 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 715 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
741 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no]) 716 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
717 LIBS="$save_LIBS"
742 718
743 if test x$support_xft = xyes; then 719 if test x$support_xft = xyes; then
744 AC_DEFINE(XFT, 1, Define to enable xft support) 720 AC_DEFINE(XFT, 1, Define to enable xft support)
745 fi 721 fi
746fi 722fi
… …
763 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) 739 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
764fi 740fi
765if test x$support_selectionscrolling = xyes; then 741if test x$support_selectionscrolling = xyes; then
766 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen) 742 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)
767fi 743fi
744if test x$support_frills = xyes; then
745 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
746fi
768if test x$support_mousewheel = xyes; then 747if test x$support_mousewheel = xyes; then
769 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) 748 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
770fi 749fi
771if test x$support_mouseslipwheel = xyes; then 750if test x$support_mouseslipwheel = xyes; then
772 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling) 751 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
773fi 752fi
774if test x$support_afterimage = xyes; then 753if test x$support_afterimage = xyes; then
775 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing) 754 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
776 AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libAfterImage) 755 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps. Needs libAfterImage)
777fi 756fi
778 757
779dnl if test x$support_afterstep = xyes; then 758dnl if test x$support_afterstep = xyes; then
780dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager) 759dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)
781dnl fi 760dnl fi
… …
865AC_SUBST(PERLPRIVLIBEXP) 844AC_SUBST(PERLPRIVLIBEXP)
866AC_SUBST(PERL) 845AC_SUBST(PERL)
867AC_SUBST(IF_PERL) 846AC_SUBST(IF_PERL)
868AC_SUBST(PERL_O) 847AC_SUBST(PERL_O)
869 848
870if test x$support_perl = xyes; then
871 support_frills=yes
872fi
873
874if test x$support_frills = xyes; then
875 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
876fi
877
878AC_SUBST(CFLAGS) 849AC_SUBST(CFLAGS)
879AC_SUBST(CPPFLAGS) 850AC_SUBST(CPPFLAGS)
880AC_SUBST(LDFLAGS) 851AC_SUBST(LDFLAGS)
881AC_SUBST(X_CFLAGS) 852AC_SUBST(X_CFLAGS)
882 853

Diff Legend

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