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.82 by root, Sun Nov 11 04:08:00 2007 UTC vs.
Revision 1.107 by sf-exg, Sun Jan 31 09:47:24 2010 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
105support_text_blink=yes 92support_text_blink=yes
106support_pointer_blank=yes 93support_pointer_blank=yes
107support_scroll_rxvt=yes 94support_scroll_rxvt=yes
108support_scroll_next=yes 95support_scroll_next=yes
109support_scroll_xterm=yes 96support_scroll_xterm=yes
110support_scroll_plain=yes
111support_xim=yes 97support_xim=yes
112support_afterimage=yes 98support_afterimage=yes
113support_afterstep=yes 99support_afterstep=yes
114support_xft=yes 100support_xft=yes
115support_unicode3=no 101support_unicode3=no
122 108
123dnl# -------------------------------------------------------------------------- 109dnl# --------------------------------------------------------------------------
124dnl# CHECKING COMMAND LINE OPTIONS 110dnl# CHECKING COMMAND LINE OPTIONS
125dnl# -------------------------------------------------------------------------- 111dnl# --------------------------------------------------------------------------
126 112
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, 113AC_ARG_ENABLE(everything,
134 [ --enable-everything enable standard non-multichoice features 114 [ --enable-everything enable standard non-multichoice features
135 NOTE: this option is order dependent 115 NOTE: this option is order dependent],
136 NOTE: automatically enabled with --enable-shared],
137 [ 116 [
138 if test x$enableval = xno; then 117 if test x$enableval = xno; then
139 support_frills=no 118 support_frills=no
140 support_inheritpixmap=no 119 support_inheritpixmap=no
141 support_fading=no 120 support_fading=no
147 support_text_blink=no 126 support_text_blink=no
148 support_pointer_blank=no 127 support_pointer_blank=no
149 support_scroll_rxvt=no 128 support_scroll_rxvt=no
150 support_scroll_next=no 129 support_scroll_next=no
151 support_scroll_xterm=no 130 support_scroll_xterm=no
152 support_scroll_plain=no
153 support_utmp=no 131 support_utmp=no
154 support_wtmp=no 132 support_wtmp=no
155 support_xim=no 133 support_xim=no
156 support_afterimage=no 134 support_afterimage=no
157 support_afterstep=no 135 support_afterstep=no
176 support_text_blink=yes 154 support_text_blink=yes
177 support_pointer_blank=yes 155 support_pointer_blank=yes
178 support_scroll_rxvt=yes 156 support_scroll_rxvt=yes
179 support_scroll_next=yes 157 support_scroll_next=yes
180 support_scroll_xterm=yes 158 support_scroll_xterm=yes
181 support_scroll_plain=yes
182 support_utmp=yes 159 support_utmp=yes
183 support_wtmp=yes 160 support_wtmp=yes
184 support_xim=yes 161 support_xim=yes
185 support_afterimage=yes 162 support_afterimage=yes
186 support_afterstep=yes 163 support_afterstep=yes
193 support_perl=yes 170 support_perl=yes
194 codesets=all 171 codesets=all
195 fi 172 fi
196 ]) 173 ])
197 174
175ASSERTIONS=no
176AC_ARG_ENABLE(assert,
177 [ --enable-assert enable assertions],
178 [if test x$enableval = xyes; then
179 ASSERTIONS=yes
180 fi])
181if test x$ASSERTIONS = xno; then
182 AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging))
183fi
184
198WARNINGS=no 185WARNINGS=no
199AC_ARG_ENABLE(warnings, 186AC_ARG_ENABLE(warnings,
200 [ --enable-warnings turn on g++ warnings], 187 [ --enable-warnings turn on g++ warnings],
201 [if test x$enableval = xyes; then 188 [if test x$enableval = xyes; then
202 WARNINGS=yes 189 WARNINGS=yes
234 [if test x$enableval = xyes -o x$enableval = xno; then 221 [if test x$enableval = xyes -o x$enableval = xno; then
235 support_styles=$enableval 222 support_styles=$enableval
236 fi]) 223 fi])
237 224
238AC_ARG_ENABLE(afterimage, 225AC_ARG_ENABLE(afterimage,
239 [ --enable-afterimage enable integration with libAfterImage for background images], 226 [ --enable-afterimage enable integration with libAfterImage for background images],
240 [if test x$enableval = xyes -o x$enableval = xno; then 227 [if test x$enableval = xyes -o x$enableval = xno; then
241 support_afterimage=$enableval 228 support_afterimage=$enableval
242 fi]) 229 fi])
243 230
244AC_ARG_WITH(afterimage_config, 231AC_ARG_WITH(afterimage_config,
285 272
286AC_ARG_ENABLE(perl, 273AC_ARG_ENABLE(perl,
287 [ --enable-perl enable embedded perl interpreter], 274 [ --enable-perl enable embedded perl interpreter],
288 [if test x$enableval = xyes -o x$enableval = xno; then 275 [if test x$enableval = xyes -o x$enableval = xno; then
289 support_perl=$enableval 276 support_perl=$enableval
290 fi])
291
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]) 277 fi])
297 278
298AC_ARG_WITH(codesets, 279AC_ARG_WITH(codesets,
299 [ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)], 280 [ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
300 [codesets="$withval"]) 281 [codesets="$withval"])
435 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" 416 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
436 fi]) 417 fi])
437 418
438dnl# -------------------------------------------------------------------------- 419dnl# --------------------------------------------------------------------------
439 420
421LIBEV_M4_AVOID_LIBRT=1
440m4_include([libev/libev.m4]) 422m4_include([libev/libev.m4])
441 423
442dnl# -------------------------------------------------------------------------- 424dnl# --------------------------------------------------------------------------
443 425
444AC_PATH_PROG(TIC, tic, :) 426AC_PATH_PROG(TIC, tic, :)
445
446dnl# need a neat way to detect SVR4 or its features
447dnl# in src/command.c we use these functions:
448dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
449dnl# - but are these also defined for other systems?
450
451dnl# hack to find if this is SVR4 -- who knows?
452dnl## AC_MSG_CHECKING(for SVR4)
453dnl## AC_EGREP_CPP(yes,
454dnl## [#if defined (SVR4) || defined (_SVR4) || defined (__svr4__)
455dnl## yes;
456dnl## #endif
457dnl## ], [AC_MSG_RESULT(yes); AC_DEFINE(PERHAPS_SVR4)], AC_MSG_RESULT(perhaps not?))
458 427
459AC_PATH_XTRA 428AC_PATH_XTRA
460 429
461AFTERIMAGE_CFLAGS= 430AFTERIMAGE_CFLAGS=
462AFTERIMAGE_LIBS= 431AFTERIMAGE_LIBS=
494fi 463fi
495 464
496dnl# -------------------------------------------------------------------------- 465dnl# --------------------------------------------------------------------------
497dnl# CHECKING FOR HEADER FILES 466dnl# CHECKING FOR HEADER FILES
498dnl# -------------------------------------------------------------------------- 467dnl# --------------------------------------------------------------------------
499AC_HEADER_SYS_WAIT
500AC_CHECK_HEADERS( \ 468AC_CHECK_HEADERS( \
501 assert.h \
502 fcntl.h \
503 stdarg.h \
504 stdlib.h \
505 string.h \
506 termios.h \
507 unistd.h \
508 sys/byteorder.h \ 469 sys/byteorder.h \
509 sys/ioctl.h \ 470 sys/ioctl.h \
510 sys/select.h \
511 sys/sockio.h \ 471 sys/sockio.h \
512 sys/strredir.h \ 472 sys/strredir.h \
513 sys/time.h \
514 stdint.h \ 473 stdint.h \
515 wchar.h \ 474 wchar.h \
516 cwchar \ 475 cwchar \
517 clocale \
518) 476)
519
520AC_HEADER_TIME
521
522dnl# check to allow both <termios.h> and <sys/ioctl.h>
523AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
524[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
525#include <sys/ioctl.h>
526#ifdef HAVE_TERMIOS_H
527#include <termios.h>
528#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
529 477
530AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 478AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
531[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])]) 479[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
532if test x$rxvt_cv_xpointer = xyes; then 480if test x$rxvt_cv_xpointer = xyes; then
533 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 481 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
534fi 482fi
535 483
536AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, 484AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
537[AC_COMPILE_IFELSE( 485[AC_COMPILE_IFELSE(
538 [AC_LANG_PROGRAM([ 486 [AC_LANG_PROGRAM([
539#define XLIB_ILLEGAL_ACCESS 487#define XLIB_ILLEGAL_ACCESS
540#include <X11/Xlib.h> 488#include <X11/Xlib.h>
541 ],[ 489 ],[
542 Display *dpy; 490 Display *dpy;
543 dpy->xdefaults = (char *)0; 491 dpy->xdefaults = (char *)0;
544 ])], 492 ])],
545 [rxvt_xlib_illegal_access=yes],[rxvt_xlib_illegal_access=no] 493 [rxvt_cv_xlib_illegal_access=yes],[rxvt_cv_xlib_illegal_access=no]
546)]) 494)])
547if test x$rxvt_xlib_illegal_access = xyes; then 495if test x$rxvt_cv_xlib_illegal_access = xyes; then
548 AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it) 496 AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it)
549fi 497fi
550
551AC_C_CONST
552AC_C_INLINE
553
554dnl> AC_HEADER_STDC dnl# skip this test, Sun always fails anyhow.
555 498
556dnl# -------------------------------------------------------------------------- 499dnl# --------------------------------------------------------------------------
557dnl# CHECKING FOR MISSING TYPEDEFS 500dnl# CHECKING FOR MISSING TYPEDEFS
558dnl# -------------------------------------------------------------------------- 501dnl# --------------------------------------------------------------------------
559dnl# Missing typedefs and replacements 502dnl# Missing typedefs and replacements
560AC_TYPE_MODE_T 503AC_TYPE_MODE_T
561dnl> AC_CHECK_TYPE(umode_t, int)
562dnl> AC_CHECK_TYPE(off_t, long)
563AC_TYPE_PID_T 504AC_TYPE_PID_T
564AC_TYPE_UID_T 505AC_TYPE_UID_T
565 506AC_TYPE_INT16_T
566AC_CHECK_SIZEOF(short, 2) 507AC_TYPE_UINT16_T
567AC_CHECK_SIZEOF(int, 4) 508AC_TYPE_INT32_T
568dnl AC_CHECK_SIZEOF(long, 4) 509AC_TYPE_UINT32_T
569AC_CHECK_SIZEOF(long long, 8)
570AC_CHECK_SIZEOF(int *, 4)
571
572dnl# see usage below
573AC_DEFUN([RXVT_CHECK_SIZE],
574 [AC_CACHE_CHECK([for $2], $1,
575 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl
576if test "$ac_cv_sizeof_char" -ge $3; then
577 $1="$4 char"
578else
579 if test "$ac_cv_sizeof_short" -ge $3; then
580 $1="$4 short"
581 else
582 if test "$ac_cv_sizeof_int" -ge $3; then
583 $1="$4 int"
584 else
585 if test "$ac_cv_sizeof_long" -ge $3; then
586 $1="$4 long"
587 else
588 if test "$ac_cv_sizeof_long_long" -ge $3; then
589 $1="$4 long long"
590 else
591 $1="$4 $5" # we _must_ have a (possibly wrong) default
592 fi
593 fi
594 fi
595 fi
596fi])])]
597if test x"$$1" != xyes; then
598 $6="typedef $$1 $2;"
599else
600 if test x"$4" = x; then
601 $6="/* typedef $5 $2; */"
602 else
603 $6="/* typedef $4 $5 $2; */"
604 fi
605fi dnl
606)
607dnl#
608dnl# Look for types the system may know about anyway.
609dnl#
610RXVT_CHECK_SIZE(rxvt_cv_int16_t, int16_t, 2, , short, rxvt_int16_typedef)
611AC_SUBST(rxvt_int16_typedef)
612RXVT_CHECK_SIZE(rxvt_cv_uint16_t, uint16_t, 2, unsigned, short, rxvt_uint16_typedef)
613AC_SUBST(rxvt_uint16_typedef)
614RXVT_CHECK_SIZE(rxvt_cv_int32_t, int32_t, 4, , int, rxvt_int32_typedef)
615AC_SUBST(rxvt_int32_typedef)
616RXVT_CHECK_SIZE(rxvt_cv_uint32_t, uint32_t, 4, unsigned, int, rxvt_uint32_typedef)
617AC_SUBST(rxvt_uint32_typedef)
618dnl RXVT_CHECK_SIZE(rxvt_cv_int64_t, int64_t, 8, , long long, rxvt_int64_typedef)
619dnl AC_SUBST(rxvt_int64_typedef)
620dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
621dnl AC_SUBST(rxvt_uint64_typedef)
622dnl#
623dnl# Now look for another we use
624dnl#
625if test "$ac_cv_sizeof_int_p" -eq 8; then
626 rxvt_intp_define="#define intp_t int64_t"
627 rxvt_u_intp_define="#define u_intp_t u_int64_t"
628else
629 if test "$ac_cv_sizeof_int_p" -eq 4; then
630 rxvt_intp_define="#define intp_t int32_t"
631 rxvt_u_intp_define="#define u_intp_t u_int32_t"
632 else
633 if test "$ac_cv_sizeof_int_p" -eq 2; then
634 rxvt_intp_define="#define intp_t int16_t"
635 rxvt_u_intp_define="#define u_intp_t u_int16_t"
636 else
637 rxvt_intp_define="#error set intp_t"
638 rxvt_u_intp_define="#error set u_intp_t"
639 fi
640 fi
641fi
642AC_SUBST(rxvt_intp_define)
643AC_SUBST(rxvt_u_intp_define)
644 510
645dnl# -------------------------------------------------------------------------- 511dnl# --------------------------------------------------------------------------
646dnl# CHECKING FOR LIBRARY FUNCTIONS 512dnl# CHECKING FOR LIBRARY FUNCTIONS
647dnl# -------------------------------------------------------------------------- 513dnl# --------------------------------------------------------------------------
648AC_TYPE_SIGNAL
649dnl> AC_FUNC_VPRINTF
650
651AC_CHECK_FUNCS(unsetenv) 514AC_CHECK_FUNCS(unsetenv)
652 515
653UTMP_CHECK 516UTMP_CHECK
654 517
655dnl# -------------------------------------------------------------------------- 518dnl# --------------------------------------------------------------------------
674 exit (1);}]])],[dnl 537 exit (1);}]])],[dnl
675 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 538 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
676 :])]) 539 :])])
677 if test x$rxvt_cv_func_xlocale = xyes; then 540 if test x$rxvt_cv_func_xlocale = xyes; then
678 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input) 541 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
679 AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb, 542 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
680 [AC_COMPILE_IFELSE([ 543 [AC_COMPILE_IFELSE([
681 #include <X11/Xlib.h> 544 #include <X11/Xlib.h>
682 545
683 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); 546 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
684 547
685 void f() { 548 void f() {
686 XIMCallback cb; 549 XIMCallback cb;
687 cb.callback = im_destroy_cb; 550 cb.callback = im_destroy_cb;
688 } 551 }
689 ],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)]) 552 ],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
690 553
691 if test x$rxvt_broken_ximcb = xyes; then 554 if test x$rxvt_cv_broken_ximcb = xyes; then
692 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.) 555 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
693 fi 556 fi
694 fi 557 fi
695fi 558fi
696 559
725dnl# now add and remove other stuff 588dnl# now add and remove other stuff
726dnl# -------------------------------------------------------------------------- 589dnl# --------------------------------------------------------------------------
727if test x$support_xft = xyes; then 590if test x$support_xft = xyes; then
728 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 591 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
729 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 592 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
730 LIBS="$LIBS `$PKG_CONFIG xft --libs`" 593 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
731 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 594 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
732 else 595 else
733 AC_PATH_PROG(XFT_CONFIG, xft-config, no) 596 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
734 if test $XFT_CONFIG != no; then 597 if test $XFT_CONFIG != no; then
735 LIBS="$LIBS `$XFT_CONFIG --libs`" 598 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
736 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 599 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
737 fi 600 fi
738 fi 601 fi
739 602
603 save_LIBS="$LIBS"
604 LIBS="$LIBS $X_LIBS"
740 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 605 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
741 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no]) 606 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
607 LIBS="$save_LIBS"
742 608
743 if test x$support_xft = xyes; then 609 if test x$support_xft = xyes; then
744 AC_DEFINE(XFT, 1, Define to enable xft support) 610 AC_DEFINE(XFT, 1, Define to enable xft support)
745 fi 611 fi
746fi 612fi
781 647
782dnl if test x$support_afterstep = xyes; then 648dnl if test x$support_afterstep = xyes; then
783dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager) 649dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)
784dnl fi 650dnl fi
785 651
652scrolltypes=plain
653AC_DEFINE(PLAIN_SCROLLBAR, 1, Support plain style scrollbars)
654
786if test x$support_scroll_rxvt = xyes; then 655if test x$support_scroll_rxvt = xyes; then
787 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars) 656 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)
788 scrolltypes="rxvt" 657 scrolltypes="$scrolltypes rxvt"
789fi 658fi
790if test x$support_scroll_next = xyes; then 659if test x$support_scroll_next = xyes; then
791 AC_DEFINE(NEXT_SCROLLBAR, 1, Support NeXT style scrollbars) 660 AC_DEFINE(NEXT_SCROLLBAR, 1, Support NeXT style scrollbars)
792 scrolltypes="$scrolltypes next" 661 scrolltypes="$scrolltypes next"
793fi 662fi
794if test x$support_scroll_xterm = xyes; then 663if test x$support_scroll_xterm = xyes; then
795 AC_DEFINE(XTERM_SCROLLBAR, 1, Support Xterm style scrollbars) 664 AC_DEFINE(XTERM_SCROLLBAR, 1, Support Xterm style scrollbars)
796 scrolltypes="$scrolltypes xterm" 665 scrolltypes="$scrolltypes xterm"
797fi
798if test x$support_scroll_plain = xyes; then
799 AC_DEFINE(PLAIN_SCROLLBAR, 1, Support plain style scrollbars)
800 scrolltypes="$scrolltypes plain"
801fi 666fi
802if test x$support_pointer_blank = xyes; then 667if test x$support_pointer_blank = xyes; then
803 AC_DEFINE(POINTER_BLANK, 1, Define if you want hide the pointer while typing) 668 AC_DEFINE(POINTER_BLANK, 1, Define if you want hide the pointer while typing)
804fi 669fi
805if test x$support_text_blink = xyes; then 670if test x$support_text_blink = xyes; then
836 701
837 save_CXXFLAGS="$CXXFLAGS" 702 save_CXXFLAGS="$CXXFLAGS"
838 save_LIBS="$LIBS" 703 save_LIBS="$LIBS"
839 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`" 704 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`"
840 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`" 705 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
841 AC_TRY_LINK([ 706 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
842#include <EXTERN.h> 707#include <EXTERN.h>
843#include <perl.h> 708#include <perl.h>
844#include <XSUB.h> 709#include <XSUB.h>
845],[ 710]], [[
846 PerlInterpreter *perl = perl_alloc (); 711 PerlInterpreter *perl = perl_alloc ();
847],[rxvt_perl_link=yes],[rxvt_perl_link=no]) 712]])],[rxvt_perl_link=yes],[rxvt_perl_link=no])
848 CXXFLAGS="$save_CXXFLAGS" 713 CXXFLAGS="$save_CXXFLAGS"
849 LIBS="$save_LIBS" 714 LIBS="$save_LIBS"
850 715
851 if test x$rxvt_perl_link = xyes; then 716 if test x$rxvt_perl_link = xyes; then
852 AC_MSG_RESULT(ok) 717 AC_MSG_RESULT(ok)
883AC_SUBST(AFTERIMAGE_CFLAGS) 748AC_SUBST(AFTERIMAGE_CFLAGS)
884AC_SUBST(AFTERIMAGE_LIBS) 749AC_SUBST(AFTERIMAGE_LIBS)
885 750
886AC_ARG_PROGRAM 751AC_ARG_PROGRAM
887 752
888dnl# test for "sun" or "__sun__" before include sys_ioctl
889
890dnl# revert HAVE_BLAH_H into a "#include <blah.h>"
891AC_DEFUN([RXVT_DEFINE_TO_INCLUDE], dnl
892[if test "$$3" = "$4" -o "$$5" = "$6"; then
893 $1="#include <$2>"
894else
895 $1="/* #include <$2> */"
896fi dnl
897AC_SUBST($1)])
898
899RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch)
900RXVT_DEFINE_TO_INCLUDE(include_stdarg_h, cstdarg, ac_cv_header_stdarg_h, yes, notset, dontmatch)
901RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, cstdlib, ac_cv_header_stdlib_h, yes, notset, dontmatch)
902RXVT_DEFINE_TO_INCLUDE(include_unistd_h, unistd.h, ac_cv_header_unistd_h, yes, notset, dontmatch)
903RXVT_DEFINE_TO_INCLUDE(include_string_h, cstring, ac_cv_header_string_h, yes, notset, dontmatch)
904RXVT_DEFINE_TO_INCLUDE(include_fcntl_h, fcntl.h, ac_cv_header_fcntl_h, yes, notset, dontmatch)
905RXVT_DEFINE_TO_INCLUDE(include_util_h, util.h, ac_cv_header_util_h, yes, notset, dontmatch)
906RXVT_DEFINE_TO_INCLUDE(include_assert_h, assert.h, ac_cv_header_assert_h, yes, notset, dontmatch)
907RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch)
908RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch)
909RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
910RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)
911RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
912
913AC_CONFIG_FILES([Makefile \ 753AC_CONFIG_FILES([Makefile \
914doc/Makefile \ 754doc/Makefile \
915src/Makefile \ 755src/Makefile \
916src/rxvtlib.h \
917]) 756])
918AC_OUTPUT 757AC_OUTPUT
919 758
920echo "Configuration: 759echo "Configuration:
921 760

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines