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.89 by ayin, Mon Dec 10 23:36:05 2007 UTC vs.
Revision 1.112 by sf-exg, Thu Jul 22 15:42:49 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
20dnl AC_SUBST(LIBVERSION)dnl
21 19
22echo "" 20echo ""
23echo "configuring for rxvt $VERSION" 21echo "configuring for rxvt $VERSION"
24echo "" 22echo ""
25 23
… …
30AC_PROG_CXX 28AC_PROG_CXX
31AC_PROG_CPP 29AC_PROG_CPP
32AC_PROG_INSTALL 30AC_PROG_INSTALL
33 31
34AC_AIX 32AC_AIX
33AC_GNU_SOURCE
35AC_ISC_POSIX 34AC_ISC_POSIX
36AC_LANG(C++) 35AC_LANG(C++)
37 36
38dnl check wether we can link with gcc -lsupc++ 37dnl check whether we can link with gcc -lsupc++
39if test x$GCC = xyes && test x$GXX = xyes; then 38if test x$GCC = xyes && test x$GXX = xyes; then
40 dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it 39 dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it
41 AC_MSG_CHECKING([for working libsupc++]) 40 AC_MSG_CHECKING([for working libsupc++])
42 save_CXX="$CXX" 41 save_CXX="$CXX"
43 save_LIBS="$LIBS" 42 save_LIBS="$LIBS"
… …
68 CXXFLAGS="-O" 67 CXXFLAGS="-O"
69 fi 68 fi
70 CFLAGS="$CXXFLAGS" 69 CFLAGS="$CXXFLAGS"
71fi 70fi
72 71
73AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)
74
75case $host in 72case $host in
76 *-*-solaris* ) 73 *-*-solaris* )
77 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)
78 ;; 75 ;;
79esac 76esac
80 77
81dnl if test x$GXX = xyes; then
82dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now...
83dnl fi
84
85dnl# FreeBSD needs to link libxpg4 78dnl# FreeBSD needs to link libxpg4
86AC_CHECK_FUNC(setlocale, [], [AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])]) 79AC_SEARCH_LIBS(setlocale, xpg4)
87 80
88dnl# solaris needs to link libnsl and socket 81dnl# solaris needs to link libnsl and socket
89AC_CHECK_FUNC(gethostbyname, [], [AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])]) 82AC_SEARCH_LIBS(gethostbyname, nsl)
90AC_CHECK_FUNC(socket, [], [AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])]) 83AC_SEARCH_LIBS(socket, socket)
91
92dnl AC_ENABLE_SHARED(no)dnl# libtool
93dnl AC_ENABLE_STATIC(yes)dnl# libtool
94dnl AC_PROG_LIBTOOL()dnl# libtool
95 84
96support_frills=yes 85support_frills=yes
97support_inheritpixmap=yes 86support_inheritpixmap=yes
98support_fading=yes 87support_fading=yes
99support_keepscrolling=yes 88support_keepscrolling=yes
… …
103support_text_blink=yes 92support_text_blink=yes
104support_pointer_blank=yes 93support_pointer_blank=yes
105support_scroll_rxvt=yes 94support_scroll_rxvt=yes
106support_scroll_next=yes 95support_scroll_next=yes
107support_scroll_xterm=yes 96support_scroll_xterm=yes
108support_scroll_plain=yes
109support_xim=yes 97support_xim=yes
110support_afterimage=yes 98support_afterimage=yes
111support_afterstep=yes 99support_afterstep=yes
112support_xft=yes 100support_xft=yes
113support_unicode3=no 101support_unicode3=no
… …
120 108
121dnl# -------------------------------------------------------------------------- 109dnl# --------------------------------------------------------------------------
122dnl# CHECKING COMMAND LINE OPTIONS 110dnl# CHECKING COMMAND LINE OPTIONS
123dnl# -------------------------------------------------------------------------- 111dnl# --------------------------------------------------------------------------
124 112
125dnl if test "x$enable_shared" = xyes; then
126dnl AC_DEFINE(LIBRXVT, 1, Build shared library version - specify via configure only)
127dnl INSTALL_LIBRXVT=yes
128dnl fi
129dnl AC_SUBST(INSTALL_LIBRXVT)
130
131AC_ARG_ENABLE(everything, 113AC_ARG_ENABLE(everything,
132 [ --enable-everything enable standard non-multichoice features 114 [ --enable-everything enable standard non-multichoice features
133 NOTE: this option is order dependent], 115 NOTE: this option is order dependent],
134 [ 116 [
135 if test x$enableval = xno; then 117 if test x$enableval = xno; then
136 support_frills=no 118 support_frills=no
137 support_inheritpixmap=no 119 support_inheritpixmap=no
138 support_fading=no 120 support_fading=no
… …
144 support_text_blink=no 126 support_text_blink=no
145 support_pointer_blank=no 127 support_pointer_blank=no
146 support_scroll_rxvt=no 128 support_scroll_rxvt=no
147 support_scroll_next=no 129 support_scroll_next=no
148 support_scroll_xterm=no 130 support_scroll_xterm=no
149 support_scroll_plain=no
150 support_utmp=no 131 support_utmp=no
151 support_wtmp=no 132 support_wtmp=no
152 support_xim=no 133 support_xim=no
153 support_afterimage=no 134 support_afterimage=no
154 support_afterstep=no 135 support_afterstep=no
… …
173 support_text_blink=yes 154 support_text_blink=yes
174 support_pointer_blank=yes 155 support_pointer_blank=yes
175 support_scroll_rxvt=yes 156 support_scroll_rxvt=yes
176 support_scroll_next=yes 157 support_scroll_next=yes
177 support_scroll_xterm=yes 158 support_scroll_xterm=yes
178 support_scroll_plain=yes
179 support_utmp=yes 159 support_utmp=yes
180 support_wtmp=yes 160 support_wtmp=yes
181 support_xim=yes 161 support_xim=yes
182 support_afterimage=yes 162 support_afterimage=yes
183 support_afterstep=yes 163 support_afterstep=yes
… …
190 support_perl=yes 170 support_perl=yes
191 codesets=all 171 codesets=all
192 fi 172 fi
193 ]) 173 ])
194 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
195WARNINGS=no 185WARNINGS=no
196AC_ARG_ENABLE(warnings, 186AC_ARG_ENABLE(warnings,
197 [ --enable-warnings turn on g++ warnings], 187 [ --enable-warnings turn on g++ warnings],
198 [if test x$enableval = xyes; then 188 [if test x$enableval = xyes; then
199 WARNINGS=yes 189 WARNINGS=yes
… …
206 else 196 else
207 CXXFLAGS="$CXXFLAGS -w" 197 CXXFLAGS="$CXXFLAGS -w"
208 fi 198 fi
209fi 199fi
210 200
201support_256_color=no
202AC_ARG_ENABLE(256-color,
203 [ --enable-256-color enable 256-color support],
204 [if test x$enableval = xyes; then
205 support_256_color=yes
206 fi])
207if test x$support_256_color = xyes; then
208 AC_DEFINE(USE_256_COLORS, 1, Define if you want 256-color support)
209fi
210
211AC_ARG_ENABLE(unicode3, 211AC_ARG_ENABLE(unicode3,
212 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters], 212 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters],
213 [if test x$enableval = xyes -o x$enableval = xno; then 213 [if test x$enableval = xyes -o x$enableval = xno; then
214 support_unicode3=$enableval 214 support_unicode3=$enableval
215 fi]) 215 fi])
… …
231 [if test x$enableval = xyes -o x$enableval = xno; then 231 [if test x$enableval = xyes -o x$enableval = xno; then
232 support_styles=$enableval 232 support_styles=$enableval
233 fi]) 233 fi])
234 234
235AC_ARG_ENABLE(afterimage, 235AC_ARG_ENABLE(afterimage,
236 [ --enable-afterimage enable integration with libAfterImage for background images], 236 [ --enable-afterimage enable integration with libAfterImage for background images],
237 [if test x$enableval = xyes -o x$enableval = xno; then 237 [if test x$enableval = xyes -o x$enableval = xno; then
238 support_afterimage=$enableval 238 support_afterimage=$enableval
239 fi]) 239 fi])
240 240
241AC_ARG_WITH(afterimage_config, 241AC_ARG_WITH(afterimage_config,
… …
276 276
277AC_ARG_ENABLE(xterm-scroll, 277AC_ARG_ENABLE(xterm-scroll,
278 [ --enable-xterm-scroll enable Xterm style scrollbar], 278 [ --enable-xterm-scroll enable Xterm style scrollbar],
279 [if test x$enableval = xyes -o x$enableval = xno; then 279 [if test x$enableval = xyes -o x$enableval = xno; then
280 support_scroll_xterm=$enableval 280 support_scroll_xterm=$enableval
281 fi])
282
283AC_ARG_ENABLE(plain-scroll,
284 [ --enable-plain-scroll enable plain style scrollbar],
285 [if test x$enableval = xyes -o x$enableval = xno; then
286 support_scroll_plain=$enableval
287 fi]) 281 fi])
288 282
289AC_ARG_ENABLE(perl, 283AC_ARG_ENABLE(perl,
290 [ --enable-perl enable embedded perl interpreter], 284 [ --enable-perl enable embedded perl interpreter],
291 [if test x$enableval = xyes -o x$enableval = xno; then 285 [if test x$enableval = xyes -o x$enableval = xno; then
… …
413 [if test x$enableval = xyes -o x$enableval = xno; then 407 [if test x$enableval = xyes -o x$enableval = xno; then
414 support_text_blink=$enableval 408 support_text_blink=$enableval
415 fi]) 409 fi])
416 410
417AC_ARG_ENABLE(pointer-blank, 411AC_ARG_ENABLE(pointer-blank,
418 [ --enable-pointer-blank enable pointer blank when typing or inactive pointer], 412 [ --enable-pointer-blank enable pointer blanking when typing or inactive],
419 [if test x$enableval = xyes -o x$enableval = xno; then 413 [if test x$enableval = xyes -o x$enableval = xno; then
420 support_pointer_blank=$enableval 414 support_pointer_blank=$enableval
421 fi]) 415 fi])
422 416
423AC_ARG_WITH(term, 417AC_ARG_WITH(term,
… …
480 474
481dnl# -------------------------------------------------------------------------- 475dnl# --------------------------------------------------------------------------
482dnl# CHECKING FOR HEADER FILES 476dnl# CHECKING FOR HEADER FILES
483dnl# -------------------------------------------------------------------------- 477dnl# --------------------------------------------------------------------------
484AC_CHECK_HEADERS( \ 478AC_CHECK_HEADERS( \
485 assert.h \
486 fcntl.h \
487 stdarg.h \
488 stdlib.h \
489 string.h \
490 termios.h \
491 unistd.h \
492 sys/byteorder.h \ 479 sys/byteorder.h \
493 sys/ioctl.h \ 480 sys/ioctl.h \
494 sys/select.h \
495 sys/sockio.h \ 481 sys/sockio.h \
496 sys/strredir.h \ 482 sys/strredir.h \
497 sys/time.h \
498 stdint.h \ 483 stdint.h \
499 wchar.h \ 484 wchar.h \
500 cwchar \ 485 cwchar \
501 clocale \
502) 486)
503
504dnl# check to allow both <termios.h> and <sys/ioctl.h>
505AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
506[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
507#include <sys/ioctl.h>
508#ifdef HAVE_TERMIOS_H
509#include <termios.h>
510#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
511 487
512AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 488AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
513[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])]) 489[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
514if test x$rxvt_cv_xpointer = xyes; then 490if test x$rxvt_cv_xpointer = xyes; then
515 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 491 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
516fi 492fi
517 493
518AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, 494AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
519[AC_COMPILE_IFELSE( 495[AC_COMPILE_IFELSE(
520 [AC_LANG_PROGRAM([ 496 [AC_LANG_PROGRAM([
521#define XLIB_ILLEGAL_ACCESS 497#define XLIB_ILLEGAL_ACCESS
522#include <X11/Xlib.h> 498#include <X11/Xlib.h>
523 ],[ 499 ],[
524 Display *dpy; 500 Display *dpy;
525 dpy->xdefaults = (char *)0; 501 dpy->xdefaults = (char *)0;
526 ])], 502 ])],
527 [rxvt_xlib_illegal_access=yes],[rxvt_xlib_illegal_access=no] 503 [rxvt_cv_xlib_illegal_access=yes],[rxvt_cv_xlib_illegal_access=no]
528)]) 504)])
529if test x$rxvt_xlib_illegal_access = xyes; then 505if test x$rxvt_cv_xlib_illegal_access = xyes; then
530 AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it) 506 AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it)
531fi 507fi
532 508
533dnl# -------------------------------------------------------------------------- 509dnl# --------------------------------------------------------------------------
534dnl# CHECKING FOR MISSING TYPEDEFS 510dnl# CHECKING FOR MISSING TYPEDEFS
535dnl# -------------------------------------------------------------------------- 511dnl# --------------------------------------------------------------------------
536dnl# Missing typedefs and replacements 512dnl# Missing typedefs and replacements
537AC_TYPE_MODE_T 513AC_TYPE_MODE_T
538dnl> AC_CHECK_TYPE(umode_t, int)
539dnl> AC_CHECK_TYPE(off_t, long)
540AC_TYPE_PID_T 514AC_TYPE_PID_T
541AC_TYPE_UID_T 515AC_TYPE_UID_T
542 516AC_TYPE_INT16_T
543AC_CHECK_SIZEOF(short, 2) 517AC_TYPE_UINT16_T
544AC_CHECK_SIZEOF(int, 4) 518AC_TYPE_INT32_T
545dnl AC_CHECK_SIZEOF(long, 4) 519AC_TYPE_UINT32_T
546AC_CHECK_SIZEOF(long long, 8)
547AC_CHECK_SIZEOF(int *, 4)
548
549dnl# see usage below
550AC_DEFUN([RXVT_CHECK_SIZE],
551 [AC_CACHE_CHECK([for $2], $1,
552 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl
553if test "$ac_cv_sizeof_char" -ge $3; then
554 $1="$4 char"
555else
556 if test "$ac_cv_sizeof_short" -ge $3; then
557 $1="$4 short"
558 else
559 if test "$ac_cv_sizeof_int" -ge $3; then
560 $1="$4 int"
561 else
562 if test "$ac_cv_sizeof_long" -ge $3; then
563 $1="$4 long"
564 else
565 if test "$ac_cv_sizeof_long_long" -ge $3; then
566 $1="$4 long long"
567 else
568 $1="$4 $5" # we _must_ have a (possibly wrong) default
569 fi
570 fi
571 fi
572 fi
573fi])])]
574if test x"$$1" != xyes; then
575 $6="typedef $$1 $2;"
576else
577 if test x"$4" = x; then
578 $6="/* typedef $5 $2; */"
579 else
580 $6="/* typedef $4 $5 $2; */"
581 fi
582fi dnl
583)
584dnl#
585dnl# Look for types the system may know about anyway.
586dnl#
587RXVT_CHECK_SIZE(rxvt_cv_int16_t, int16_t, 2, , short, rxvt_int16_typedef)
588AC_SUBST(rxvt_int16_typedef)
589RXVT_CHECK_SIZE(rxvt_cv_uint16_t, uint16_t, 2, unsigned, short, rxvt_uint16_typedef)
590AC_SUBST(rxvt_uint16_typedef)
591RXVT_CHECK_SIZE(rxvt_cv_int32_t, int32_t, 4, , int, rxvt_int32_typedef)
592AC_SUBST(rxvt_int32_typedef)
593RXVT_CHECK_SIZE(rxvt_cv_uint32_t, uint32_t, 4, unsigned, int, rxvt_uint32_typedef)
594AC_SUBST(rxvt_uint32_typedef)
595dnl RXVT_CHECK_SIZE(rxvt_cv_int64_t, int64_t, 8, , long long, rxvt_int64_typedef)
596dnl AC_SUBST(rxvt_int64_typedef)
597dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
598dnl AC_SUBST(rxvt_uint64_typedef)
599dnl#
600dnl# Now look for another we use
601dnl#
602if test "$ac_cv_sizeof_int_p" -eq 8; then
603 rxvt_intp_define="#define intp_t int64_t"
604 rxvt_u_intp_define="#define u_intp_t u_int64_t"
605else
606 if test "$ac_cv_sizeof_int_p" -eq 4; then
607 rxvt_intp_define="#define intp_t int32_t"
608 rxvt_u_intp_define="#define u_intp_t u_int32_t"
609 else
610 if test "$ac_cv_sizeof_int_p" -eq 2; then
611 rxvt_intp_define="#define intp_t int16_t"
612 rxvt_u_intp_define="#define u_intp_t u_int16_t"
613 else
614 rxvt_intp_define="#error set intp_t"
615 rxvt_u_intp_define="#error set u_intp_t"
616 fi
617 fi
618fi
619AC_SUBST(rxvt_intp_define)
620AC_SUBST(rxvt_u_intp_define)
621 520
622dnl# -------------------------------------------------------------------------- 521dnl# --------------------------------------------------------------------------
623dnl# CHECKING FOR LIBRARY FUNCTIONS 522dnl# CHECKING FOR LIBRARY FUNCTIONS
624dnl# -------------------------------------------------------------------------- 523dnl# --------------------------------------------------------------------------
625AC_CHECK_FUNCS(unsetenv) 524AC_CHECK_FUNCS(unsetenv)
… …
648 exit (1);}]])],[dnl 547 exit (1);}]])],[dnl
649 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 548 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
650 :])]) 549 :])])
651 if test x$rxvt_cv_func_xlocale = xyes; then 550 if test x$rxvt_cv_func_xlocale = xyes; then
652 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input) 551 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
653 AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb, 552 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
654 [AC_COMPILE_IFELSE([ 553 [AC_COMPILE_IFELSE([
655 #include <X11/Xlib.h> 554 #include <X11/Xlib.h>
656 555
657 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); 556 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
658 557
659 void f() { 558 void f() {
660 XIMCallback cb; 559 XIMCallback cb;
661 cb.callback = im_destroy_cb; 560 cb.callback = im_destroy_cb;
662 } 561 }
663 ],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)]) 562 ],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
664 563
665 if test x$rxvt_broken_ximcb = xyes; then 564 if test x$rxvt_cv_broken_ximcb = xyes; then
666 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.) 565 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
667 fi 566 fi
668 fi 567 fi
669fi 568fi
670 569
… …
758 657
759dnl if test x$support_afterstep = xyes; then 658dnl if test x$support_afterstep = xyes; then
760dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager) 659dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)
761dnl fi 660dnl fi
762 661
662scrolltypes=plain
663AC_DEFINE(PLAIN_SCROLLBAR, 1, Support plain style scrollbars)
664
763if test x$support_scroll_rxvt = xyes; then 665if test x$support_scroll_rxvt = xyes; then
764 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars) 666 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)
765 scrolltypes="rxvt" 667 scrolltypes="$scrolltypes rxvt"
766fi 668fi
767if test x$support_scroll_next = xyes; then 669if test x$support_scroll_next = xyes; then
768 AC_DEFINE(NEXT_SCROLLBAR, 1, Support NeXT style scrollbars) 670 AC_DEFINE(NEXT_SCROLLBAR, 1, Support NeXT style scrollbars)
769 scrolltypes="$scrolltypes next" 671 scrolltypes="$scrolltypes next"
770fi 672fi
771if test x$support_scroll_xterm = xyes; then 673if test x$support_scroll_xterm = xyes; then
772 AC_DEFINE(XTERM_SCROLLBAR, 1, Support Xterm style scrollbars) 674 AC_DEFINE(XTERM_SCROLLBAR, 1, Support Xterm style scrollbars)
773 scrolltypes="$scrolltypes xterm" 675 scrolltypes="$scrolltypes xterm"
774fi
775if test x$support_scroll_plain = xyes; then
776 AC_DEFINE(PLAIN_SCROLLBAR, 1, Support plain style scrollbars)
777 scrolltypes="$scrolltypes plain"
778fi 676fi
779if test x$support_pointer_blank = xyes; then 677if test x$support_pointer_blank = xyes; then
780 AC_DEFINE(POINTER_BLANK, 1, Define if you want hide the pointer while typing) 678 AC_DEFINE(POINTER_BLANK, 1, Define if you want hide the pointer while typing)
781fi 679fi
782if test x$support_text_blink = xyes; then 680if test x$support_text_blink = xyes; then
… …
813 711
814 save_CXXFLAGS="$CXXFLAGS" 712 save_CXXFLAGS="$CXXFLAGS"
815 save_LIBS="$LIBS" 713 save_LIBS="$LIBS"
816 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`" 714 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`"
817 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`" 715 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
818 AC_TRY_LINK([ 716 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
819#include <EXTERN.h> 717#include <EXTERN.h>
820#include <perl.h> 718#include <perl.h>
821#include <XSUB.h> 719#include <XSUB.h>
822],[ 720]], [[
823 PerlInterpreter *perl = perl_alloc (); 721 PerlInterpreter *perl = perl_alloc ();
824],[rxvt_perl_link=yes],[rxvt_perl_link=no]) 722]])],[rxvt_perl_link=yes],[rxvt_perl_link=no])
825 CXXFLAGS="$save_CXXFLAGS" 723 CXXFLAGS="$save_CXXFLAGS"
826 LIBS="$save_LIBS" 724 LIBS="$save_LIBS"
827 725
828 if test x$rxvt_perl_link = xyes; then 726 if test x$rxvt_perl_link = xyes; then
829 AC_MSG_RESULT(ok) 727 AC_MSG_RESULT(ok)
… …
845AC_SUBST(PERLPRIVLIBEXP) 743AC_SUBST(PERLPRIVLIBEXP)
846AC_SUBST(PERL) 744AC_SUBST(PERL)
847AC_SUBST(IF_PERL) 745AC_SUBST(IF_PERL)
848AC_SUBST(PERL_O) 746AC_SUBST(PERL_O)
849 747
850AC_SUBST(CFLAGS)
851AC_SUBST(CPPFLAGS)
852AC_SUBST(LDFLAGS)
853AC_SUBST(X_CFLAGS)
854 748
855dnl# Attack the libs 749dnl# Attack the libs
856AC_SUBST(LIBS)
857AC_SUBST(X_LIBS)
858AC_SUBST(X_EXTRA_LIBS)
859 750
860AC_SUBST(AFTERIMAGE_CFLAGS) 751AC_SUBST(AFTERIMAGE_CFLAGS)
861AC_SUBST(AFTERIMAGE_LIBS) 752AC_SUBST(AFTERIMAGE_LIBS)
862 753
863AC_ARG_PROGRAM 754AC_ARG_PROGRAM
864
865dnl# test for "sun" or "__sun__" before include sys_ioctl
866
867dnl# revert HAVE_BLAH_H into a "#include <blah.h>"
868AC_DEFUN([RXVT_DEFINE_TO_INCLUDE], dnl
869[if test "$$3" = "$4" -o "$$5" = "$6"; then
870 $1="#include <$2>"
871else
872 $1="/* #include <$2> */"
873fi dnl
874AC_SUBST($1)])
875
876RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch)
877RXVT_DEFINE_TO_INCLUDE(include_stdarg_h, cstdarg, ac_cv_header_stdarg_h, yes, notset, dontmatch)
878RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, cstdlib, ac_cv_header_stdlib_h, yes, notset, dontmatch)
879RXVT_DEFINE_TO_INCLUDE(include_unistd_h, unistd.h, ac_cv_header_unistd_h, yes, notset, dontmatch)
880RXVT_DEFINE_TO_INCLUDE(include_string_h, cstring, ac_cv_header_string_h, yes, notset, dontmatch)
881RXVT_DEFINE_TO_INCLUDE(include_fcntl_h, fcntl.h, ac_cv_header_fcntl_h, yes, notset, dontmatch)
882RXVT_DEFINE_TO_INCLUDE(include_util_h, util.h, ac_cv_header_util_h, yes, notset, dontmatch)
883RXVT_DEFINE_TO_INCLUDE(include_assert_h, assert.h, ac_cv_header_assert_h, yes, notset, dontmatch)
884RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch)
885RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch)
886RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
887RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)
888RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
889 755
890AC_CONFIG_FILES([Makefile \ 756AC_CONFIG_FILES([Makefile \
891doc/Makefile \ 757doc/Makefile \
892src/Makefile \ 758src/Makefile \
893src/rxvtlib.h \
894]) 759])
895AC_OUTPUT 760AC_OUTPUT
896 761
897echo "Configuration: 762echo "Configuration:
898 763

Diff Legend

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