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.83 by root, Sun Nov 18 01:02:09 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
21AC_SUBST(LIBVERSION)dnl
22 19
23echo "" 20echo ""
24echo "configuring for rxvt $VERSION" 21echo "configuring for rxvt $VERSION"
25echo "" 22echo ""
26 23
27orig_CXXFLAGS="$CXXFLAGS" 24orig_CXXFLAGS="$CXXFLAGS"
28 25
29dnl# Checks for programs. 26dnl# Checks for programs.
30dnl AC_MAKE_SET
31
32AC_PROG_CC 27AC_PROG_CC
33AC_PROG_CXX 28AC_PROG_CXX
34AC_PROG_CPP 29AC_PROG_CPP
35AC_PROG_INSTALL 30AC_PROG_INSTALL
36 31
37AC_AIX 32AC_AIX
33AC_GNU_SOURCE
38AC_ISC_POSIX 34AC_ISC_POSIX
39AC_LANG(C++) 35AC_LANG(C++)
40 36
41dnl check wether we can link with gcc -lsupc++ 37dnl check wether we can link with gcc -lsupc++
42if test x$GCC = xyes && test x$GXX = xyes; then 38if test x$GCC = xyes && test x$GXX = xyes; then
… …
63dnl# -------------------------------------------------------------------------- 59dnl# --------------------------------------------------------------------------
64dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' 60dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
65dnl# 61dnl#
66if test -z "$orig_CXXFLAGS"; then 62if test -z "$orig_CXXFLAGS"; then
67 if test x$GCC = xyes && test "x$GXX" = xyes; then 63 if test x$GCC = xyes && test "x$GXX" = xyes; then
68 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"
69 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"]) 65 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"])
70 else 66 else
71 CXXFLAGS="-O" 67 CXXFLAGS="-O"
72 fi 68 fi
73 CFLAGS="$CXXFLAGS" 69 CFLAGS="$CXXFLAGS"
74fi 70fi
75 71
76AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)
77
78case $host in 72case $host in
79 *-*-solaris* ) 73 *-*-solaris* )
80 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)
81 ;; 75 ;;
82esac 76esac
83 77
84dnl if test x$GXX = xyes; then
85dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now...
86dnl fi
87
88dnl# FreeBSD needs to link libxpg4 78dnl# FreeBSD needs to link libxpg4
89AC_CHECK_FUNC(setlocale, [], [AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])]) 79AC_CHECK_FUNC(setlocale, [], [AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])])
90 80
91dnl# solaris needs to link libnsl and socket 81dnl# solaris needs to link libnsl and socket
92AC_CHECK_FUNC(gethostbyname, [], [AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])]) 82AC_CHECK_FUNC(gethostbyname, [], [AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])])
93AC_CHECK_FUNC(socket, [], [AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])]) 83AC_CHECK_FUNC(socket, [], [AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])])
94
95dnl AC_ENABLE_SHARED(no)dnl# libtool
96dnl AC_ENABLE_STATIC(yes)dnl# libtool
97dnl AC_PROG_LIBTOOL()dnl# libtool
98 84
99support_frills=yes 85support_frills=yes
100support_inheritpixmap=yes 86support_inheritpixmap=yes
101support_fading=yes 87support_fading=yes
102support_keepscrolling=yes 88support_keepscrolling=yes
… …
106support_text_blink=yes 92support_text_blink=yes
107support_pointer_blank=yes 93support_pointer_blank=yes
108support_scroll_rxvt=yes 94support_scroll_rxvt=yes
109support_scroll_next=yes 95support_scroll_next=yes
110support_scroll_xterm=yes 96support_scroll_xterm=yes
111support_scroll_plain=yes
112support_xim=yes 97support_xim=yes
113support_afterimage=yes 98support_afterimage=yes
114support_afterstep=yes 99support_afterstep=yes
115support_xft=yes 100support_xft=yes
116support_unicode3=no 101support_unicode3=no
… …
123 108
124dnl# -------------------------------------------------------------------------- 109dnl# --------------------------------------------------------------------------
125dnl# CHECKING COMMAND LINE OPTIONS 110dnl# CHECKING COMMAND LINE OPTIONS
126dnl# -------------------------------------------------------------------------- 111dnl# --------------------------------------------------------------------------
127 112
128if test "x$enable_shared" = xyes; then
129 AC_DEFINE(LIBRXVT, 1, Build shared library version - specify via configure only)
130 INSTALL_LIBRXVT=yes
131fi
132AC_SUBST(INSTALL_LIBRXVT)
133
134AC_ARG_ENABLE(everything, 113AC_ARG_ENABLE(everything,
135 [ --enable-everything enable standard non-multichoice features 114 [ --enable-everything enable standard non-multichoice features
136 NOTE: this option is order dependent 115 NOTE: this option is order dependent],
137 NOTE: automatically enabled with --enable-shared],
138 [ 116 [
139 if test x$enableval = xno; then 117 if test x$enableval = xno; then
140 support_frills=no 118 support_frills=no
141 support_inheritpixmap=no 119 support_inheritpixmap=no
142 support_fading=no 120 support_fading=no
… …
148 support_text_blink=no 126 support_text_blink=no
149 support_pointer_blank=no 127 support_pointer_blank=no
150 support_scroll_rxvt=no 128 support_scroll_rxvt=no
151 support_scroll_next=no 129 support_scroll_next=no
152 support_scroll_xterm=no 130 support_scroll_xterm=no
153 support_scroll_plain=no
154 support_utmp=no 131 support_utmp=no
155 support_wtmp=no 132 support_wtmp=no
156 support_xim=no 133 support_xim=no
157 support_afterimage=no 134 support_afterimage=no
158 support_afterstep=no 135 support_afterstep=no
… …
177 support_text_blink=yes 154 support_text_blink=yes
178 support_pointer_blank=yes 155 support_pointer_blank=yes
179 support_scroll_rxvt=yes 156 support_scroll_rxvt=yes
180 support_scroll_next=yes 157 support_scroll_next=yes
181 support_scroll_xterm=yes 158 support_scroll_xterm=yes
182 support_scroll_plain=yes
183 support_utmp=yes 159 support_utmp=yes
184 support_wtmp=yes 160 support_wtmp=yes
185 support_xim=yes 161 support_xim=yes
186 support_afterimage=yes 162 support_afterimage=yes
187 support_afterstep=yes 163 support_afterstep=yes
… …
194 support_perl=yes 170 support_perl=yes
195 codesets=all 171 codesets=all
196 fi 172 fi
197 ]) 173 ])
198 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
199WARNINGS=no 185WARNINGS=no
200AC_ARG_ENABLE(warnings, 186AC_ARG_ENABLE(warnings,
201 [ --enable-warnings turn on g++ warnings], 187 [ --enable-warnings turn on g++ warnings],
202 [if test x$enableval = xyes; then 188 [if test x$enableval = xyes; then
203 WARNINGS=yes 189 WARNINGS=yes
… …
235 [if test x$enableval = xyes -o x$enableval = xno; then 221 [if test x$enableval = xyes -o x$enableval = xno; then
236 support_styles=$enableval 222 support_styles=$enableval
237 fi]) 223 fi])
238 224
239AC_ARG_ENABLE(afterimage, 225AC_ARG_ENABLE(afterimage,
240 [ --enable-afterimage enable integration with libAfterImage for background images], 226 [ --enable-afterimage enable integration with libAfterImage for background images],
241 [if test x$enableval = xyes -o x$enableval = xno; then 227 [if test x$enableval = xyes -o x$enableval = xno; then
242 support_afterimage=$enableval 228 support_afterimage=$enableval
243 fi]) 229 fi])
244 230
245AC_ARG_WITH(afterimage_config, 231AC_ARG_WITH(afterimage_config,
… …
286 272
287AC_ARG_ENABLE(perl, 273AC_ARG_ENABLE(perl,
288 [ --enable-perl enable embedded perl interpreter], 274 [ --enable-perl enable embedded perl interpreter],
289 [if test x$enableval = xyes -o x$enableval = xno; then 275 [if test x$enableval = xyes -o x$enableval = xno; then
290 support_perl=$enableval 276 support_perl=$enableval
291 fi])
292
293AC_ARG_ENABLE(plain-scroll,
294 [ --enable-plain-scroll enable plain style scrollbar],
295 [if test x$enableval = xyes -o x$enableval = xno; then
296 support_scroll_plain=$enableval
297 fi]) 277 fi])
298 278
299AC_ARG_WITH(codesets, 279AC_ARG_WITH(codesets,
300 [ --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)],
301 [codesets="$withval"]) 281 [codesets="$withval"])
… …
436 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"
437 fi]) 417 fi])
438 418
439dnl# -------------------------------------------------------------------------- 419dnl# --------------------------------------------------------------------------
440 420
421LIBEV_M4_AVOID_LIBRT=1
441m4_include([libev/libev.m4]) 422m4_include([libev/libev.m4])
442 423
443dnl# -------------------------------------------------------------------------- 424dnl# --------------------------------------------------------------------------
444 425
445AC_PATH_PROG(TIC, tic, :) 426AC_PATH_PROG(TIC, tic, :)
446
447dnl# need a neat way to detect SVR4 or its features
448dnl# in src/command.c we use these functions:
449dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
450dnl# - but are these also defined for other systems?
451
452dnl# hack to find if this is SVR4 -- who knows?
453dnl## AC_MSG_CHECKING(for SVR4)
454dnl## AC_EGREP_CPP(yes,
455dnl## [#if defined (SVR4) || defined (_SVR4) || defined (__svr4__)
456dnl## yes;
457dnl## #endif
458dnl## ], [AC_MSG_RESULT(yes); AC_DEFINE(PERHAPS_SVR4)], AC_MSG_RESULT(perhaps not?))
459 427
460AC_PATH_XTRA 428AC_PATH_XTRA
461 429
462AFTERIMAGE_CFLAGS= 430AFTERIMAGE_CFLAGS=
463AFTERIMAGE_LIBS= 431AFTERIMAGE_LIBS=
… …
495fi 463fi
496 464
497dnl# -------------------------------------------------------------------------- 465dnl# --------------------------------------------------------------------------
498dnl# CHECKING FOR HEADER FILES 466dnl# CHECKING FOR HEADER FILES
499dnl# -------------------------------------------------------------------------- 467dnl# --------------------------------------------------------------------------
500AC_HEADER_SYS_WAIT
501AC_CHECK_HEADERS( \ 468AC_CHECK_HEADERS( \
502 assert.h \
503 fcntl.h \
504 stdarg.h \
505 stdlib.h \
506 string.h \
507 termios.h \
508 unistd.h \
509 sys/byteorder.h \ 469 sys/byteorder.h \
510 sys/ioctl.h \ 470 sys/ioctl.h \
511 sys/select.h \
512 sys/sockio.h \ 471 sys/sockio.h \
513 sys/strredir.h \ 472 sys/strredir.h \
514 sys/time.h \
515 stdint.h \ 473 stdint.h \
516 wchar.h \ 474 wchar.h \
517 cwchar \ 475 cwchar \
518 clocale \
519) 476)
520
521AC_HEADER_TIME
522
523dnl# check to allow both <termios.h> and <sys/ioctl.h>
524AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
525[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
526#include <sys/ioctl.h>
527#ifdef HAVE_TERMIOS_H
528#include <termios.h>
529#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
530 477
531AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 478AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
532[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])])
533if test x$rxvt_cv_xpointer = xyes; then 480if test x$rxvt_cv_xpointer = xyes; then
534 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 481 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
535fi 482fi
536 483
537AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, 484AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
538[AC_COMPILE_IFELSE( 485[AC_COMPILE_IFELSE(
539 [AC_LANG_PROGRAM([ 486 [AC_LANG_PROGRAM([
540#define XLIB_ILLEGAL_ACCESS 487#define XLIB_ILLEGAL_ACCESS
541#include <X11/Xlib.h> 488#include <X11/Xlib.h>
542 ],[ 489 ],[
543 Display *dpy; 490 Display *dpy;
544 dpy->xdefaults = (char *)0; 491 dpy->xdefaults = (char *)0;
545 ])], 492 ])],
546 [rxvt_xlib_illegal_access=yes],[rxvt_xlib_illegal_access=no] 493 [rxvt_cv_xlib_illegal_access=yes],[rxvt_cv_xlib_illegal_access=no]
547)]) 494)])
548if test x$rxvt_xlib_illegal_access = xyes; then 495if test x$rxvt_cv_xlib_illegal_access = xyes; then
549 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)
550fi 497fi
551
552AC_C_CONST
553AC_C_INLINE
554
555dnl> AC_HEADER_STDC dnl# skip this test, Sun always fails anyhow.
556 498
557dnl# -------------------------------------------------------------------------- 499dnl# --------------------------------------------------------------------------
558dnl# CHECKING FOR MISSING TYPEDEFS 500dnl# CHECKING FOR MISSING TYPEDEFS
559dnl# -------------------------------------------------------------------------- 501dnl# --------------------------------------------------------------------------
560dnl# Missing typedefs and replacements 502dnl# Missing typedefs and replacements
561AC_TYPE_MODE_T 503AC_TYPE_MODE_T
562dnl> AC_CHECK_TYPE(umode_t, int)
563dnl> AC_CHECK_TYPE(off_t, long)
564AC_TYPE_PID_T 504AC_TYPE_PID_T
565AC_TYPE_UID_T 505AC_TYPE_UID_T
566 506AC_TYPE_INT16_T
567AC_CHECK_SIZEOF(short, 2) 507AC_TYPE_UINT16_T
568AC_CHECK_SIZEOF(int, 4) 508AC_TYPE_INT32_T
569dnl AC_CHECK_SIZEOF(long, 4) 509AC_TYPE_UINT32_T
570AC_CHECK_SIZEOF(long long, 8)
571AC_CHECK_SIZEOF(int *, 4)
572
573dnl# see usage below
574AC_DEFUN([RXVT_CHECK_SIZE],
575 [AC_CACHE_CHECK([for $2], $1,
576 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl
577if test "$ac_cv_sizeof_char" -ge $3; then
578 $1="$4 char"
579else
580 if test "$ac_cv_sizeof_short" -ge $3; then
581 $1="$4 short"
582 else
583 if test "$ac_cv_sizeof_int" -ge $3; then
584 $1="$4 int"
585 else
586 if test "$ac_cv_sizeof_long" -ge $3; then
587 $1="$4 long"
588 else
589 if test "$ac_cv_sizeof_long_long" -ge $3; then
590 $1="$4 long long"
591 else
592 $1="$4 $5" # we _must_ have a (possibly wrong) default
593 fi
594 fi
595 fi
596 fi
597fi])])]
598if test x"$$1" != xyes; then
599 $6="typedef $$1 $2;"
600else
601 if test x"$4" = x; then
602 $6="/* typedef $5 $2; */"
603 else
604 $6="/* typedef $4 $5 $2; */"
605 fi
606fi dnl
607)
608dnl#
609dnl# Look for types the system may know about anyway.
610dnl#
611RXVT_CHECK_SIZE(rxvt_cv_int16_t, int16_t, 2, , short, rxvt_int16_typedef)
612AC_SUBST(rxvt_int16_typedef)
613RXVT_CHECK_SIZE(rxvt_cv_uint16_t, uint16_t, 2, unsigned, short, rxvt_uint16_typedef)
614AC_SUBST(rxvt_uint16_typedef)
615RXVT_CHECK_SIZE(rxvt_cv_int32_t, int32_t, 4, , int, rxvt_int32_typedef)
616AC_SUBST(rxvt_int32_typedef)
617RXVT_CHECK_SIZE(rxvt_cv_uint32_t, uint32_t, 4, unsigned, int, rxvt_uint32_typedef)
618AC_SUBST(rxvt_uint32_typedef)
619dnl RXVT_CHECK_SIZE(rxvt_cv_int64_t, int64_t, 8, , long long, rxvt_int64_typedef)
620dnl AC_SUBST(rxvt_int64_typedef)
621dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
622dnl AC_SUBST(rxvt_uint64_typedef)
623dnl#
624dnl# Now look for another we use
625dnl#
626if test "$ac_cv_sizeof_int_p" -eq 8; then
627 rxvt_intp_define="#define intp_t int64_t"
628 rxvt_u_intp_define="#define u_intp_t u_int64_t"
629else
630 if test "$ac_cv_sizeof_int_p" -eq 4; then
631 rxvt_intp_define="#define intp_t int32_t"
632 rxvt_u_intp_define="#define u_intp_t u_int32_t"
633 else
634 if test "$ac_cv_sizeof_int_p" -eq 2; then
635 rxvt_intp_define="#define intp_t int16_t"
636 rxvt_u_intp_define="#define u_intp_t u_int16_t"
637 else
638 rxvt_intp_define="#error set intp_t"
639 rxvt_u_intp_define="#error set u_intp_t"
640 fi
641 fi
642fi
643AC_SUBST(rxvt_intp_define)
644AC_SUBST(rxvt_u_intp_define)
645 510
646dnl# -------------------------------------------------------------------------- 511dnl# --------------------------------------------------------------------------
647dnl# CHECKING FOR LIBRARY FUNCTIONS 512dnl# CHECKING FOR LIBRARY FUNCTIONS
648dnl# -------------------------------------------------------------------------- 513dnl# --------------------------------------------------------------------------
649AC_TYPE_SIGNAL
650dnl> AC_FUNC_VPRINTF
651
652AC_CHECK_FUNCS(unsetenv) 514AC_CHECK_FUNCS(unsetenv)
653 515
654UTMP_CHECK 516UTMP_CHECK
655 517
656dnl# -------------------------------------------------------------------------- 518dnl# --------------------------------------------------------------------------
… …
675 exit (1);}]])],[dnl 537 exit (1);}]])],[dnl
676 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 538 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
677 :])]) 539 :])])
678 if test x$rxvt_cv_func_xlocale = xyes; then 540 if test x$rxvt_cv_func_xlocale = xyes; then
679 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)
680 AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb, 542 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
681 [AC_COMPILE_IFELSE([ 543 [AC_COMPILE_IFELSE([
682 #include <X11/Xlib.h> 544 #include <X11/Xlib.h>
683 545
684 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); 546 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
685 547
686 void f() { 548 void f() {
687 XIMCallback cb; 549 XIMCallback cb;
688 cb.callback = im_destroy_cb; 550 cb.callback = im_destroy_cb;
689 } 551 }
690 ],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)]) 552 ],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
691 553
692 if test x$rxvt_broken_ximcb = xyes; then 554 if test x$rxvt_cv_broken_ximcb = xyes; then
693 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.)
694 fi 556 fi
695 fi 557 fi
696fi 558fi
697 559
… …
785 647
786dnl if test x$support_afterstep = xyes; then 648dnl if test x$support_afterstep = xyes; then
787dnl 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)
788dnl fi 650dnl fi
789 651
652scrolltypes=plain
653AC_DEFINE(PLAIN_SCROLLBAR, 1, Support plain style scrollbars)
654
790if test x$support_scroll_rxvt = xyes; then 655if test x$support_scroll_rxvt = xyes; then
791 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars) 656 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)
792 scrolltypes="rxvt" 657 scrolltypes="$scrolltypes rxvt"
793fi 658fi
794if test x$support_scroll_next = xyes; then 659if test x$support_scroll_next = xyes; then
795 AC_DEFINE(NEXT_SCROLLBAR, 1, Support NeXT style scrollbars) 660 AC_DEFINE(NEXT_SCROLLBAR, 1, Support NeXT style scrollbars)
796 scrolltypes="$scrolltypes next" 661 scrolltypes="$scrolltypes next"
797fi 662fi
798if test x$support_scroll_xterm = xyes; then 663if test x$support_scroll_xterm = xyes; then
799 AC_DEFINE(XTERM_SCROLLBAR, 1, Support Xterm style scrollbars) 664 AC_DEFINE(XTERM_SCROLLBAR, 1, Support Xterm style scrollbars)
800 scrolltypes="$scrolltypes xterm" 665 scrolltypes="$scrolltypes xterm"
801fi
802if test x$support_scroll_plain = xyes; then
803 AC_DEFINE(PLAIN_SCROLLBAR, 1, Support plain style scrollbars)
804 scrolltypes="$scrolltypes plain"
805fi 666fi
806if test x$support_pointer_blank = xyes; then 667if test x$support_pointer_blank = xyes; then
807 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)
808fi 669fi
809if test x$support_text_blink = xyes; then 670if test x$support_text_blink = xyes; then
… …
840 701
841 save_CXXFLAGS="$CXXFLAGS" 702 save_CXXFLAGS="$CXXFLAGS"
842 save_LIBS="$LIBS" 703 save_LIBS="$LIBS"
843 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`" 704 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`"
844 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`" 705 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
845 AC_TRY_LINK([ 706 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
846#include <EXTERN.h> 707#include <EXTERN.h>
847#include <perl.h> 708#include <perl.h>
848#include <XSUB.h> 709#include <XSUB.h>
849],[ 710]], [[
850 PerlInterpreter *perl = perl_alloc (); 711 PerlInterpreter *perl = perl_alloc ();
851],[rxvt_perl_link=yes],[rxvt_perl_link=no]) 712]])],[rxvt_perl_link=yes],[rxvt_perl_link=no])
852 CXXFLAGS="$save_CXXFLAGS" 713 CXXFLAGS="$save_CXXFLAGS"
853 LIBS="$save_LIBS" 714 LIBS="$save_LIBS"
854 715
855 if test x$rxvt_perl_link = xyes; then 716 if test x$rxvt_perl_link = xyes; then
856 AC_MSG_RESULT(ok) 717 AC_MSG_RESULT(ok)
… …
887AC_SUBST(AFTERIMAGE_CFLAGS) 748AC_SUBST(AFTERIMAGE_CFLAGS)
888AC_SUBST(AFTERIMAGE_LIBS) 749AC_SUBST(AFTERIMAGE_LIBS)
889 750
890AC_ARG_PROGRAM 751AC_ARG_PROGRAM
891 752
892dnl# test for "sun" or "__sun__" before include sys_ioctl
893
894dnl# revert HAVE_BLAH_H into a "#include <blah.h>"
895AC_DEFUN([RXVT_DEFINE_TO_INCLUDE], dnl
896[if test "$$3" = "$4" -o "$$5" = "$6"; then
897 $1="#include <$2>"
898else
899 $1="/* #include <$2> */"
900fi dnl
901AC_SUBST($1)])
902
903RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch)
904RXVT_DEFINE_TO_INCLUDE(include_stdarg_h, cstdarg, ac_cv_header_stdarg_h, yes, notset, dontmatch)
905RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, cstdlib, ac_cv_header_stdlib_h, yes, notset, dontmatch)
906RXVT_DEFINE_TO_INCLUDE(include_unistd_h, unistd.h, ac_cv_header_unistd_h, yes, notset, dontmatch)
907RXVT_DEFINE_TO_INCLUDE(include_string_h, cstring, ac_cv_header_string_h, yes, notset, dontmatch)
908RXVT_DEFINE_TO_INCLUDE(include_fcntl_h, fcntl.h, ac_cv_header_fcntl_h, yes, notset, dontmatch)
909RXVT_DEFINE_TO_INCLUDE(include_util_h, util.h, ac_cv_header_util_h, yes, notset, dontmatch)
910RXVT_DEFINE_TO_INCLUDE(include_assert_h, assert.h, ac_cv_header_assert_h, yes, notset, dontmatch)
911RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch)
912RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch)
913RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
914RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)
915RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
916
917AC_CONFIG_FILES([Makefile \ 753AC_CONFIG_FILES([Makefile \
918doc/Makefile \ 754doc/Makefile \
919src/Makefile \ 755src/Makefile \
920src/rxvtlib.h \
921]) 756])
922AC_OUTPUT 757AC_OUTPUT
923 758
924echo "Configuration: 759echo "Configuration:
925 760

Diff Legend

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