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.85 by root, Mon Nov 26 20:07:49 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
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 whether 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
43 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
44 AC_MSG_CHECKING([for working libsupc++]) 40 AC_MSG_CHECKING([for working libsupc++])
45 save_CXX="$CXX" 41 save_CXX="$CXX"
46 save_LIBS="$LIBS" 42 save_LIBS="$LIBS"
… …
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_SEARCH_LIBS(setlocale, xpg4)
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_SEARCH_LIBS(gethostbyname, nsl)
93AC_CHECK_FUNC(socket, [], [AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])]) 83AC_SEARCH_LIBS(socket, socket)
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
… …
210 else 196 else
211 CXXFLAGS="$CXXFLAGS -w" 197 CXXFLAGS="$CXXFLAGS -w"
212 fi 198 fi
213fi 199fi
214 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
215AC_ARG_ENABLE(unicode3, 211AC_ARG_ENABLE(unicode3,
216 [ --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],
217 [if test x$enableval = xyes -o x$enableval = xno; then 213 [if test x$enableval = xyes -o x$enableval = xno; then
218 support_unicode3=$enableval 214 support_unicode3=$enableval
219 fi]) 215 fi])
… …
235 [if test x$enableval = xyes -o x$enableval = xno; then 231 [if test x$enableval = xyes -o x$enableval = xno; then
236 support_styles=$enableval 232 support_styles=$enableval
237 fi]) 233 fi])
238 234
239AC_ARG_ENABLE(afterimage, 235AC_ARG_ENABLE(afterimage,
240 [ --enable-afterimage enable integration with libAfterImage for background images], 236 [ --enable-afterimage enable integration with libAfterImage for background images],
241 [if test x$enableval = xyes -o x$enableval = xno; then 237 [if test x$enableval = xyes -o x$enableval = xno; then
242 support_afterimage=$enableval 238 support_afterimage=$enableval
243 fi]) 239 fi])
244 240
245AC_ARG_WITH(afterimage_config, 241AC_ARG_WITH(afterimage_config,
… …
286 282
287AC_ARG_ENABLE(perl, 283AC_ARG_ENABLE(perl,
288 [ --enable-perl enable embedded perl interpreter], 284 [ --enable-perl enable embedded perl interpreter],
289 [if test x$enableval = xyes -o x$enableval = xno; then 285 [if test x$enableval = xyes -o x$enableval = xno; then
290 support_perl=$enableval 286 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]) 287 fi])
298 288
299AC_ARG_WITH(codesets, 289AC_ARG_WITH(codesets,
300 [ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)], 290 [ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
301 [codesets="$withval"]) 291 [codesets="$withval"])
… …
417 [if test x$enableval = xyes -o x$enableval = xno; then 407 [if test x$enableval = xyes -o x$enableval = xno; then
418 support_text_blink=$enableval 408 support_text_blink=$enableval
419 fi]) 409 fi])
420 410
421AC_ARG_ENABLE(pointer-blank, 411AC_ARG_ENABLE(pointer-blank,
422 [ --enable-pointer-blank enable pointer blank when typing or inactive pointer], 412 [ --enable-pointer-blank enable pointer blanking when typing or inactive],
423 [if test x$enableval = xyes -o x$enableval = xno; then 413 [if test x$enableval = xyes -o x$enableval = xno; then
424 support_pointer_blank=$enableval 414 support_pointer_blank=$enableval
425 fi]) 415 fi])
426 416
427AC_ARG_WITH(term, 417AC_ARG_WITH(term,
… …
442m4_include([libev/libev.m4]) 432m4_include([libev/libev.m4])
443 433
444dnl# -------------------------------------------------------------------------- 434dnl# --------------------------------------------------------------------------
445 435
446AC_PATH_PROG(TIC, tic, :) 436AC_PATH_PROG(TIC, tic, :)
447
448dnl# need a neat way to detect SVR4 or its features
449dnl# in src/command.c we use these functions:
450dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
451dnl# - but are these also defined for other systems?
452
453dnl# hack to find if this is SVR4 -- who knows?
454dnl## AC_MSG_CHECKING(for SVR4)
455dnl## AC_EGREP_CPP(yes,
456dnl## [#if defined (SVR4) || defined (_SVR4) || defined (__svr4__)
457dnl## yes;
458dnl## #endif
459dnl## ], [AC_MSG_RESULT(yes); AC_DEFINE(PERHAPS_SVR4)], AC_MSG_RESULT(perhaps not?))
460 437
461AC_PATH_XTRA 438AC_PATH_XTRA
462 439
463AFTERIMAGE_CFLAGS= 440AFTERIMAGE_CFLAGS=
464AFTERIMAGE_LIBS= 441AFTERIMAGE_LIBS=
… …
496fi 473fi
497 474
498dnl# -------------------------------------------------------------------------- 475dnl# --------------------------------------------------------------------------
499dnl# CHECKING FOR HEADER FILES 476dnl# CHECKING FOR HEADER FILES
500dnl# -------------------------------------------------------------------------- 477dnl# --------------------------------------------------------------------------
501AC_HEADER_SYS_WAIT
502AC_CHECK_HEADERS( \ 478AC_CHECK_HEADERS( \
503 assert.h \
504 fcntl.h \
505 stdarg.h \
506 stdlib.h \
507 string.h \
508 termios.h \
509 unistd.h \
510 sys/byteorder.h \ 479 sys/byteorder.h \
511 sys/ioctl.h \ 480 sys/ioctl.h \
512 sys/select.h \
513 sys/sockio.h \ 481 sys/sockio.h \
514 sys/strredir.h \ 482 sys/strredir.h \
515 sys/time.h \
516 stdint.h \ 483 stdint.h \
517 wchar.h \ 484 wchar.h \
518 cwchar \ 485 cwchar \
519 clocale \
520) 486)
521
522AC_HEADER_TIME
523
524dnl# check to allow both <termios.h> and <sys/ioctl.h>
525AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
526[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
527#include <sys/ioctl.h>
528#ifdef HAVE_TERMIOS_H
529#include <termios.h>
530#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
531 487
532AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 488AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
533[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])])
534if test x$rxvt_cv_xpointer = xyes; then 490if test x$rxvt_cv_xpointer = xyes; then
535 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 491 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
536fi 492fi
537 493
538AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, 494AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
539[AC_COMPILE_IFELSE( 495[AC_COMPILE_IFELSE(
540 [AC_LANG_PROGRAM([ 496 [AC_LANG_PROGRAM([
541#define XLIB_ILLEGAL_ACCESS 497#define XLIB_ILLEGAL_ACCESS
542#include <X11/Xlib.h> 498#include <X11/Xlib.h>
543 ],[ 499 ],[
544 Display *dpy; 500 Display *dpy;
545 dpy->xdefaults = (char *)0; 501 dpy->xdefaults = (char *)0;
546 ])], 502 ])],
547 [rxvt_xlib_illegal_access=yes],[rxvt_xlib_illegal_access=no] 503 [rxvt_cv_xlib_illegal_access=yes],[rxvt_cv_xlib_illegal_access=no]
548)]) 504)])
549if test x$rxvt_xlib_illegal_access = xyes; then 505if test x$rxvt_cv_xlib_illegal_access = xyes; then
550 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)
551fi 507fi
552
553AC_C_CONST
554AC_C_INLINE
555
556dnl> AC_HEADER_STDC dnl# skip this test, Sun always fails anyhow.
557 508
558dnl# -------------------------------------------------------------------------- 509dnl# --------------------------------------------------------------------------
559dnl# CHECKING FOR MISSING TYPEDEFS 510dnl# CHECKING FOR MISSING TYPEDEFS
560dnl# -------------------------------------------------------------------------- 511dnl# --------------------------------------------------------------------------
561dnl# Missing typedefs and replacements 512dnl# Missing typedefs and replacements
562AC_TYPE_MODE_T 513AC_TYPE_MODE_T
563dnl> AC_CHECK_TYPE(umode_t, int)
564dnl> AC_CHECK_TYPE(off_t, long)
565AC_TYPE_PID_T 514AC_TYPE_PID_T
566AC_TYPE_UID_T 515AC_TYPE_UID_T
567 516AC_TYPE_INT16_T
568AC_CHECK_SIZEOF(short, 2) 517AC_TYPE_UINT16_T
569AC_CHECK_SIZEOF(int, 4) 518AC_TYPE_INT32_T
570dnl AC_CHECK_SIZEOF(long, 4) 519AC_TYPE_UINT32_T
571AC_CHECK_SIZEOF(long long, 8)
572AC_CHECK_SIZEOF(int *, 4)
573
574dnl# see usage below
575AC_DEFUN([RXVT_CHECK_SIZE],
576 [AC_CACHE_CHECK([for $2], $1,
577 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl
578if test "$ac_cv_sizeof_char" -ge $3; then
579 $1="$4 char"
580else
581 if test "$ac_cv_sizeof_short" -ge $3; then
582 $1="$4 short"
583 else
584 if test "$ac_cv_sizeof_int" -ge $3; then
585 $1="$4 int"
586 else
587 if test "$ac_cv_sizeof_long" -ge $3; then
588 $1="$4 long"
589 else
590 if test "$ac_cv_sizeof_long_long" -ge $3; then
591 $1="$4 long long"
592 else
593 $1="$4 $5" # we _must_ have a (possibly wrong) default
594 fi
595 fi
596 fi
597 fi
598fi])])]
599if test x"$$1" != xyes; then
600 $6="typedef $$1 $2;"
601else
602 if test x"$4" = x; then
603 $6="/* typedef $5 $2; */"
604 else
605 $6="/* typedef $4 $5 $2; */"
606 fi
607fi dnl
608)
609dnl#
610dnl# Look for types the system may know about anyway.
611dnl#
612RXVT_CHECK_SIZE(rxvt_cv_int16_t, int16_t, 2, , short, rxvt_int16_typedef)
613AC_SUBST(rxvt_int16_typedef)
614RXVT_CHECK_SIZE(rxvt_cv_uint16_t, uint16_t, 2, unsigned, short, rxvt_uint16_typedef)
615AC_SUBST(rxvt_uint16_typedef)
616RXVT_CHECK_SIZE(rxvt_cv_int32_t, int32_t, 4, , int, rxvt_int32_typedef)
617AC_SUBST(rxvt_int32_typedef)
618RXVT_CHECK_SIZE(rxvt_cv_uint32_t, uint32_t, 4, unsigned, int, rxvt_uint32_typedef)
619AC_SUBST(rxvt_uint32_typedef)
620dnl RXVT_CHECK_SIZE(rxvt_cv_int64_t, int64_t, 8, , long long, rxvt_int64_typedef)
621dnl AC_SUBST(rxvt_int64_typedef)
622dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
623dnl AC_SUBST(rxvt_uint64_typedef)
624dnl#
625dnl# Now look for another we use
626dnl#
627if test "$ac_cv_sizeof_int_p" -eq 8; then
628 rxvt_intp_define="#define intp_t int64_t"
629 rxvt_u_intp_define="#define u_intp_t u_int64_t"
630else
631 if test "$ac_cv_sizeof_int_p" -eq 4; then
632 rxvt_intp_define="#define intp_t int32_t"
633 rxvt_u_intp_define="#define u_intp_t u_int32_t"
634 else
635 if test "$ac_cv_sizeof_int_p" -eq 2; then
636 rxvt_intp_define="#define intp_t int16_t"
637 rxvt_u_intp_define="#define u_intp_t u_int16_t"
638 else
639 rxvt_intp_define="#error set intp_t"
640 rxvt_u_intp_define="#error set u_intp_t"
641 fi
642 fi
643fi
644AC_SUBST(rxvt_intp_define)
645AC_SUBST(rxvt_u_intp_define)
646 520
647dnl# -------------------------------------------------------------------------- 521dnl# --------------------------------------------------------------------------
648dnl# CHECKING FOR LIBRARY FUNCTIONS 522dnl# CHECKING FOR LIBRARY FUNCTIONS
649dnl# -------------------------------------------------------------------------- 523dnl# --------------------------------------------------------------------------
650AC_TYPE_SIGNAL
651dnl> AC_FUNC_VPRINTF
652
653AC_CHECK_FUNCS(unsetenv) 524AC_CHECK_FUNCS(unsetenv)
654 525
655UTMP_CHECK 526UTMP_CHECK
656 527
657dnl# -------------------------------------------------------------------------- 528dnl# --------------------------------------------------------------------------
… …
676 exit (1);}]])],[dnl 547 exit (1);}]])],[dnl
677 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 548 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
678 :])]) 549 :])])
679 if test x$rxvt_cv_func_xlocale = xyes; then 550 if test x$rxvt_cv_func_xlocale = xyes; then
680 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)
681 AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb, 552 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
682 [AC_COMPILE_IFELSE([ 553 [AC_COMPILE_IFELSE([
683 #include <X11/Xlib.h> 554 #include <X11/Xlib.h>
684 555
685 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); 556 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
686 557
687 void f() { 558 void f() {
688 XIMCallback cb; 559 XIMCallback cb;
689 cb.callback = im_destroy_cb; 560 cb.callback = im_destroy_cb;
690 } 561 }
691 ],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)]) 562 ],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
692 563
693 if test x$rxvt_broken_ximcb = xyes; then 564 if test x$rxvt_cv_broken_ximcb = xyes; then
694 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.)
695 fi 566 fi
696 fi 567 fi
697fi 568fi
698 569
… …
786 657
787dnl if test x$support_afterstep = xyes; then 658dnl if test x$support_afterstep = xyes; then
788dnl 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)
789dnl fi 660dnl fi
790 661
662scrolltypes=plain
663AC_DEFINE(PLAIN_SCROLLBAR, 1, Support plain style scrollbars)
664
791if test x$support_scroll_rxvt = xyes; then 665if test x$support_scroll_rxvt = xyes; then
792 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars) 666 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)
793 scrolltypes="rxvt" 667 scrolltypes="$scrolltypes rxvt"
794fi 668fi
795if test x$support_scroll_next = xyes; then 669if test x$support_scroll_next = xyes; then
796 AC_DEFINE(NEXT_SCROLLBAR, 1, Support NeXT style scrollbars) 670 AC_DEFINE(NEXT_SCROLLBAR, 1, Support NeXT style scrollbars)
797 scrolltypes="$scrolltypes next" 671 scrolltypes="$scrolltypes next"
798fi 672fi
799if test x$support_scroll_xterm = xyes; then 673if test x$support_scroll_xterm = xyes; then
800 AC_DEFINE(XTERM_SCROLLBAR, 1, Support Xterm style scrollbars) 674 AC_DEFINE(XTERM_SCROLLBAR, 1, Support Xterm style scrollbars)
801 scrolltypes="$scrolltypes xterm" 675 scrolltypes="$scrolltypes xterm"
802fi
803if test x$support_scroll_plain = xyes; then
804 AC_DEFINE(PLAIN_SCROLLBAR, 1, Support plain style scrollbars)
805 scrolltypes="$scrolltypes plain"
806fi 676fi
807if test x$support_pointer_blank = xyes; then 677if test x$support_pointer_blank = xyes; then
808 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)
809fi 679fi
810if test x$support_text_blink = xyes; then 680if test x$support_text_blink = xyes; then
… …
841 711
842 save_CXXFLAGS="$CXXFLAGS" 712 save_CXXFLAGS="$CXXFLAGS"
843 save_LIBS="$LIBS" 713 save_LIBS="$LIBS"
844 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`" 714 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`"
845 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`" 715 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
846 AC_TRY_LINK([ 716 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
847#include <EXTERN.h> 717#include <EXTERN.h>
848#include <perl.h> 718#include <perl.h>
849#include <XSUB.h> 719#include <XSUB.h>
850],[ 720]], [[
851 PerlInterpreter *perl = perl_alloc (); 721 PerlInterpreter *perl = perl_alloc ();
852],[rxvt_perl_link=yes],[rxvt_perl_link=no]) 722]])],[rxvt_perl_link=yes],[rxvt_perl_link=no])
853 CXXFLAGS="$save_CXXFLAGS" 723 CXXFLAGS="$save_CXXFLAGS"
854 LIBS="$save_LIBS" 724 LIBS="$save_LIBS"
855 725
856 if test x$rxvt_perl_link = xyes; then 726 if test x$rxvt_perl_link = xyes; then
857 AC_MSG_RESULT(ok) 727 AC_MSG_RESULT(ok)
… …
873AC_SUBST(PERLPRIVLIBEXP) 743AC_SUBST(PERLPRIVLIBEXP)
874AC_SUBST(PERL) 744AC_SUBST(PERL)
875AC_SUBST(IF_PERL) 745AC_SUBST(IF_PERL)
876AC_SUBST(PERL_O) 746AC_SUBST(PERL_O)
877 747
878AC_SUBST(CFLAGS)
879AC_SUBST(CPPFLAGS)
880AC_SUBST(LDFLAGS)
881AC_SUBST(X_CFLAGS)
882 748
883dnl# Attack the libs 749dnl# Attack the libs
884AC_SUBST(LIBS)
885AC_SUBST(X_LIBS)
886AC_SUBST(X_EXTRA_LIBS)
887 750
888AC_SUBST(AFTERIMAGE_CFLAGS) 751AC_SUBST(AFTERIMAGE_CFLAGS)
889AC_SUBST(AFTERIMAGE_LIBS) 752AC_SUBST(AFTERIMAGE_LIBS)
890 753
891AC_ARG_PROGRAM 754AC_ARG_PROGRAM
892
893dnl# test for "sun" or "__sun__" before include sys_ioctl
894
895dnl# revert HAVE_BLAH_H into a "#include <blah.h>"
896AC_DEFUN([RXVT_DEFINE_TO_INCLUDE], dnl
897[if test "$$3" = "$4" -o "$$5" = "$6"; then
898 $1="#include <$2>"
899else
900 $1="/* #include <$2> */"
901fi dnl
902AC_SUBST($1)])
903
904RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch)
905RXVT_DEFINE_TO_INCLUDE(include_stdarg_h, cstdarg, ac_cv_header_stdarg_h, yes, notset, dontmatch)
906RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, cstdlib, ac_cv_header_stdlib_h, yes, notset, dontmatch)
907RXVT_DEFINE_TO_INCLUDE(include_unistd_h, unistd.h, ac_cv_header_unistd_h, yes, notset, dontmatch)
908RXVT_DEFINE_TO_INCLUDE(include_string_h, cstring, ac_cv_header_string_h, yes, notset, dontmatch)
909RXVT_DEFINE_TO_INCLUDE(include_fcntl_h, fcntl.h, ac_cv_header_fcntl_h, yes, notset, dontmatch)
910RXVT_DEFINE_TO_INCLUDE(include_util_h, util.h, ac_cv_header_util_h, yes, notset, dontmatch)
911RXVT_DEFINE_TO_INCLUDE(include_assert_h, assert.h, ac_cv_header_assert_h, yes, notset, dontmatch)
912RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch)
913RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch)
914RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
915RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)
916RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
917 755
918AC_CONFIG_FILES([Makefile \ 756AC_CONFIG_FILES([Makefile \
919doc/Makefile \ 757doc/Makefile \
920src/Makefile \ 758src/Makefile \
921src/rxvtlib.h \
922]) 759])
923AC_OUTPUT 760AC_OUTPUT
924 761
925echo "Configuration: 762echo "Configuration:
926 763

Diff Legend

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