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.56 by root, Tue Jun 26 00:40:18 2007 UTC vs.
Revision 1.85 by root, Mon Nov 26 20:07:49 2007 UTC

17changequote([, ])dnl 17changequote([, ])dnl
18AC_SUBST(VERSION)dnl 18AC_SUBST(VERSION)dnl
19AC_SUBST(DATE)dnl 19AC_SUBST(DATE)dnl
20AC_SUBST(LSMDATE)dnl 20AC_SUBST(LSMDATE)dnl
21AC_SUBST(LIBVERSION)dnl 21AC_SUBST(LIBVERSION)dnl
22
22echo "" 23echo ""
23echo "configuring for rxvt $VERSION" 24echo "configuring for rxvt $VERSION"
24echo "" 25echo ""
25 26
26orig_CXXFLAGS="$CXXFLAGS" 27orig_CXXFLAGS="$CXXFLAGS"
46 CXX="$CC" 47 CXX="$CC"
47 LIBS="$LIBS -lsupc++" 48 LIBS="$LIBS -lsupc++"
48 LINKER="$CC" 49 LINKER="$CC"
49 AC_LINK_IFELSE( 50 AC_LINK_IFELSE(
50 [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])], 51 [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])],
51 [
52 AC_MSG_RESULT(ok) 52 [AC_MSG_RESULT(ok)],
53 CXXLIB="-lsupc++"
54 ],
55 [ 53 [
56 AC_MSG_RESULT([no, making everything bigger and slower]) 54 AC_MSG_RESULT([no, making everything bigger and slower])
57 LIBS="$save_LIBS" 55 LIBS="$save_LIBS"
58 LINKER="$save_CXX" 56 LINKER="$save_CXX"
59 ] 57 ]
60 ) 58 )
61 CXX="$save_CXX" 59 CXX="$save_CXX"
62fi 60fi
63AC_SUBST(LINKER,[$LINKER]) 61AC_SUBST(LINKER,[$LINKER])
64AC_SUBST(CXXLIB)
65 62
66dnl# -------------------------------------------------------------------------- 63dnl# --------------------------------------------------------------------------
67dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' 64dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
68dnl# 65dnl#
69if test -z "$orig_CXXFLAGS"; then 66if test -z "$orig_CXXFLAGS"; then
70 if test x$GCC = xyes && test "x$GXX" = xyes; then 67 if test x$GCC = xyes && test "x$GXX" = xyes; then
71 CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs" 68 CXXFLAGS="-g -O3 -fno-rtti -fvisibility-inlines-hidden -fno-threadsafe-statics -fno-enforce-eh-specs"
72 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"]) 69 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"])
73 else 70 else
74 CXXFLAGS="-O" 71 CXXFLAGS="-O"
75 fi 72 fi
76 CFLAGS="$CXXFLAGS" 73 CFLAGS="$CXXFLAGS"
99dnl AC_ENABLE_STATIC(yes)dnl# libtool 96dnl AC_ENABLE_STATIC(yes)dnl# libtool
100dnl AC_PROG_LIBTOOL()dnl# libtool 97dnl AC_PROG_LIBTOOL()dnl# libtool
101 98
102support_frills=yes 99support_frills=yes
103support_inheritpixmap=yes 100support_inheritpixmap=yes
104support_tinting=yes
105support_fading=yes 101support_fading=yes
106support_keepscrolling=yes 102support_keepscrolling=yes
107support_selectionscrolling=yes 103support_selectionscrolling=yes
108support_mousewheel=yes 104support_mousewheel=yes
109support_mouseslipwheel=yes 105support_mouseslipwheel=yes
112support_scroll_rxvt=yes 108support_scroll_rxvt=yes
113support_scroll_next=yes 109support_scroll_next=yes
114support_scroll_xterm=yes 110support_scroll_xterm=yes
115support_scroll_plain=yes 111support_scroll_plain=yes
116support_xim=yes 112support_xim=yes
117support_xpm=yes
118support_afterimage=yes 113support_afterimage=yes
119support_afterstep=yes 114support_afterstep=yes
120support_xft=yes 115support_xft=yes
121support_unicode3=no 116support_unicode3=no
122support_combining=yes 117support_combining=yes
142 NOTE: automatically enabled with --enable-shared], 137 NOTE: automatically enabled with --enable-shared],
143 [ 138 [
144 if test x$enableval = xno; then 139 if test x$enableval = xno; then
145 support_frills=no 140 support_frills=no
146 support_inheritpixmap=no 141 support_inheritpixmap=no
147 support_tinting=no
148 support_fading=no 142 support_fading=no
149 support_keepscrolling=no 143 support_keepscrolling=no
150 support_selectionscrolling=no 144 support_selectionscrolling=no
151 support_lastlog=no 145 support_lastlog=no
152 support_mousewheel=no 146 support_mousewheel=no
158 support_scroll_xterm=no 152 support_scroll_xterm=no
159 support_scroll_plain=no 153 support_scroll_plain=no
160 support_utmp=no 154 support_utmp=no
161 support_wtmp=no 155 support_wtmp=no
162 support_xim=no 156 support_xim=no
163 support_xpm=no
164 support_afterimage=no 157 support_afterimage=no
165 support_afterstep=no 158 support_afterstep=no
166 support_xft=no 159 support_xft=no
167 support_unicode3=no 160 support_unicode3=no
168 support_combining=no 161 support_combining=no
173 codesets= 166 codesets=
174 fi 167 fi
175 if test x$enableval = xyes; then 168 if test x$enableval = xyes; then
176 support_frills=yes 169 support_frills=yes
177 support_inheritpixmap=yes 170 support_inheritpixmap=yes
178 support_tinting=yes
179 support_fading=yes 171 support_fading=yes
180 support_keepscrolling=yes 172 support_keepscrolling=yes
181 support_selectionscrolling=yes 173 support_selectionscrolling=yes
182 support_lastlog=yes 174 support_lastlog=yes
183 support_mousewheel=yes 175 support_mousewheel=yes
189 support_scroll_xterm=yes 181 support_scroll_xterm=yes
190 support_scroll_plain=yes 182 support_scroll_plain=yes
191 support_utmp=yes 183 support_utmp=yes
192 support_wtmp=yes 184 support_wtmp=yes
193 support_xim=yes 185 support_xim=yes
194 support_xpm=yes
195 support_afterimage=yes 186 support_afterimage=yes
196 support_afterstep=yes 187 support_afterstep=yes
197 support_xft=yes 188 support_xft=yes
198 support_unicode3=yes 189 support_unicode3=yes
199 support_combining=yes 190 support_combining=yes
203 support_perl=yes 194 support_perl=yes
204 codesets=all 195 codesets=all
205 fi 196 fi
206 ]) 197 ])
207 198
199WARNINGS=no
200AC_ARG_ENABLE(warnings,
201 [ --enable-warnings turn on g++ warnings],
202 [if test x$enableval = xyes; then
203 WARNINGS=yes
204 fi])
205if test x$GXX = xyes; then
206 if test $WARNINGS = yes; then
207 save_CXXFLAGS="$CXXFLAGS"
208 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor"
209 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"])
210 else
211 CXXFLAGS="$CXXFLAGS -w"
212 fi
213fi
214
208AC_ARG_ENABLE(unicode3, 215AC_ARG_ENABLE(unicode3,
209 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters], 216 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters],
210 [if test x$enableval = xyes -o x$enableval = xno; then 217 [if test x$enableval = xyes -o x$enableval = xno; then
211 support_unicode3=$enableval 218 support_unicode3=$enableval
212 fi]) 219 fi])
225 232
226AC_ARG_ENABLE(font-styles, 233AC_ARG_ENABLE(font-styles,
227 [ --enable-font-styles enable bold and italic support], 234 [ --enable-font-styles enable bold and italic support],
228 [if test x$enableval = xyes -o x$enableval = xno; then 235 [if test x$enableval = xyes -o x$enableval = xno; then
229 support_styles=$enableval 236 support_styles=$enableval
230 fi])
231
232AC_ARG_ENABLE(xpm-background,
233 [ --enable-xpm-background enable background pixmaps],
234 [if test x$enableval = xyes -o x$enableval = xno; then
235 support_xpm=$enableval
236 fi]) 237 fi])
237 238
238AC_ARG_ENABLE(afterimage, 239AC_ARG_ENABLE(afterimage,
239 [ --enable-afterimage enable integration with libAfterImage for background images], 240 [ --enable-afterimage enable integration with libAfterImage for background images],
240 [if test x$enableval = xyes -o x$enableval = xno; then 241 [if test x$enableval = xyes -o x$enableval = xno; then
245 [ --with-afterimage-config=DIR use libAfterImage config script in DIR], 246 [ --with-afterimage-config=DIR use libAfterImage config script in DIR],
246 [if test "x$withval" != x; then 247 [if test "x$withval" != x; then
247 afterimage_config=$withval/afterimage-config 248 afterimage_config=$withval/afterimage-config
248 fi]) 249 fi])
249 250
250AC_ARG_ENABLE(afterstep, 251dnl AC_ARG_ENABLE(afterstep,
251 [ --enable-afterstep enable integration with AfterStep window manager], 252dnl [ --enable-afterstep enable integration with AfterStep window manager],
252 [if test x$enableval = xyes -o x$enableval = xno; then 253dnl [if test x$enableval = xyes -o x$enableval = xno; then
253 support_afterstep=$enableval 254dnl support_afterstep=$enableval
254 fi]) 255dnl fi])
255 256
256AC_ARG_ENABLE(transparency, 257AC_ARG_ENABLE(transparency,
257 [ --enable-transparency enable transparent backgrounds], 258 [ --enable-transparency enable transparent backgrounds],
258 [if test x$enableval = xyes -o x$enableval = xno; then 259 [if test x$enableval = xyes -o x$enableval = xno; then
259 support_inheritpixmap=$enableval 260 support_inheritpixmap=$enableval
260 fi]) 261 fi])
261 262
262AC_ARG_ENABLE(tinting,
263 [ --enable-tinting enable tinting of transparent bg],
264 [if test x$enableval = xyes -o x$enableval = xno; then
265 support_tinting=$enableval
266 fi])
267
268AC_ARG_ENABLE(fading, 263AC_ARG_ENABLE(fading,
269 [ --enable-fading enable colors fading when off focus], 264 [ --enable-fading enable colors fading when off focus],
270 [if test x$enableval = xyes -o x$enableval = xno; then 265 [if test x$enableval = xyes -o x$enableval = xno; then
271 support_fading=$enableval 266 support_fading=$enableval
272 fi]) 267 fi])
300 [if test x$enableval = xyes -o x$enableval = xno; then 295 [if test x$enableval = xyes -o x$enableval = xno; then
301 support_scroll_plain=$enableval 296 support_scroll_plain=$enableval
302 fi]) 297 fi])
303 298
304AC_ARG_WITH(codesets, 299AC_ARG_WITH(codesets,
305 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)], 300 [ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
306 [codesets="$withval"]) 301 [codesets="$withval"])
307 302
308AC_ARG_ENABLE(xim, 303AC_ARG_ENABLE(xim,
309 [ --enable-xim XIM (X Input Method) protocol support], 304 [ --enable-xim XIM (X Input Method) protocol support],
310 [if test x$enableval = xyes -o x$enableval = xno; then 305 [if test x$enableval = xyes -o x$enableval = xno; then
335 support_8bitctrls=$enableval 330 support_8bitctrls=$enableval
336 fi]) 331 fi])
337 332
338RESFALLBACK=Rxvt 333RESFALLBACK=Rxvt
339AC_ARG_ENABLE(fallback, 334AC_ARG_ENABLE(fallback,
340 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)], 335 [ --enable-fallback@<:@=CLASS@:>@ fall back on CLASS resources in addition to URxvt ones (default: Rxvt)],
341 [ 336 [
342 test x$enableval = xyes && enableval=Rxvt 337 test x$enableval = xyes && enableval=Rxvt
343 test x$enableval = xno && enableval= 338 test x$enableval = xno && enableval=
344 RESFALLBACK="$enableval" 339 RESFALLBACK="$enableval"
345 ]) 340 ])
404 [if test x$enableval = xyes -o x$enableval = xno; then 399 [if test x$enableval = xyes -o x$enableval = xno; then
405 support_mousewheel=$enableval 400 support_mousewheel=$enableval
406 fi]) 401 fi])
407 402
408AC_ARG_ENABLE(slipwheeling, 403AC_ARG_ENABLE(slipwheeling,
409 [ --enable-slipwheeling enable slip wheel scrolling (requires previous)], 404 [ --enable-slipwheeling enable slip wheel scrolling (requires --enable-mousewheel)],
410 [if test x$enableval = xyes -o x$enableval = xno; then 405 [if test x$enableval = xyes -o x$enableval = xno; then
411 support_mouseslipwheel=$enableval 406 support_mouseslipwheel=$enableval
412 fi]) 407 fi])
413 408
414AC_ARG_ENABLE(smart-resize, 409AC_ARG_ENABLE(smart-resize,
441 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" 436 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
442 fi]) 437 fi])
443 438
444dnl# -------------------------------------------------------------------------- 439dnl# --------------------------------------------------------------------------
445 440
441LIBEV_M4_AVOID_LIBRT=1
442m4_include([libev/libev.m4])
443
444dnl# --------------------------------------------------------------------------
445
446AC_PATH_PROG(TIC, tic) 446AC_PATH_PROG(TIC, tic, :)
447 447
448dnl# need a neat way to detect SVR4 or its features 448dnl# need a neat way to detect SVR4 or its features
449dnl# in src/command.c we use these functions: 449dnl# in src/command.c we use these functions:
450dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> 450dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
451dnl# - but are these also defined for other systems? 451dnl# - but are these also defined for other systems?
458dnl## #endif 458dnl## #endif
459dnl## ], [AC_MSG_RESULT(yes); AC_DEFINE(PERHAPS_SVR4)], AC_MSG_RESULT(perhaps not?)) 459dnl## ], [AC_MSG_RESULT(yes); AC_DEFINE(PERHAPS_SVR4)], AC_MSG_RESULT(perhaps not?))
460 460
461AC_PATH_XTRA 461AC_PATH_XTRA
462 462
463dnl# the only reasonable way to find libXpm is do-it-yourself
464dnl# only check if we want xpm-background
465
466LIBAFTERIMAGE_CFLAGS= 463AFTERIMAGE_CFLAGS=
467AFTERIMAGE_LIBS= 464AFTERIMAGE_LIBS=
468have_afterimage= 465AFTERIMAGE_VERSION=
469 466
470if test x$support_afterimage = xyes; then 467if test x$support_afterimage = xyes; then
471 support_afterimage=no 468 support_afterimage=no
472 469
473 if test "x$afterimage_config" = "x" ; then 470 if test "x$afterimage_config" = "x" ; then
474 AC_PATH_PROG(afterimage_config, afterimage-config, no) 471 AC_PATH_PROG(afterimage_config, afterimage-config, no)
475 fi 472 fi
476 473 if test "x$afterimage_config" != "xno" ; then
477 AC_MSG_CHECKING(for libAfterImage) 474 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
478 if $afterimage_config --version >/dev/null 2>&1 ; then 475 xAFTERIMAGE_VERSION=`$afterimage_config --version`
476 if test -n "$xAFTERIMAGE_VERSION" ; then
479 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 477 xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
480 AFTERIMAGE_LIBS=`$afterimage_config --libs` 478 xAFTERIMAGE_LIBS=`$afterimage_config --libs`
481 if test "x$AFTERIMAGE_LIBS" != "x"; then 479 if test "x$xAFTERIMAGE_LIBS" != "x"; then
480 libai_ver_major=`echo $xAFTERIMAGE_VERSION | cut -f 1 -d .`
481 libai_ver_minor=`echo $xAFTERIMAGE_VERSION | cut -f 2 -d .`
482 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then
482 support_afterimage=yes 483 support_afterimage=yes
484 AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS"
485 AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS"
486 AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION"
487 fi
488 fi
483 fi 489 fi
484 fi
485
486 if test "x$support_afterimage" = "xyes"; then 490 if test "x$support_afterimage" = "xyes"; then
487 AC_MSG_RESULT($AFTERIMAGE_LIBS) 491 AC_MSG_RESULT($AFTERIMAGE_LIBS)
488 else 492 else
489 AC_MSG_RESULT(no) 493 AC_MSG_RESULT(no)
490 fi 494 fi
491fi
492
493if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then
494 VT_FIND_LIBXPM
495 if test x$no_xpm = xyes; then
496 support_xpm=needsmanualspecification
497 fi 495 fi
498fi 496fi
499 497
500dnl# -------------------------------------------------------------------------- 498dnl# --------------------------------------------------------------------------
501dnl# CHECKING FOR HEADER FILES 499dnl# CHECKING FOR HEADER FILES
529#include <sys/ioctl.h> 527#include <sys/ioctl.h>
530#ifdef HAVE_TERMIOS_H 528#ifdef HAVE_TERMIOS_H
531#include <termios.h> 529#include <termios.h>
532#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])]) 530#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
533 531
534dnl# ELF systems may want to store paths for dynamic libraries.
535dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath"
536dnl# At least one version of SunOS wants "-R path" but it's not checked yet.
537if test -n "$GCC"; then
538 LDARG="-Wl,"
539else
540 LDARG=""
541fi
542changequote(, )dnl
543R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-rpath '$LDARG'\1/g'
544changequote([, ])dnl
545
546ac_save_CFLAGS=$CFLAGS
547ac_save_LIBS=$LIBS
548CFLAGS="$CFLAGS $X_CFLAGS"
549LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
550AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath,
551[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
552#include <stdlib.h>
553main()
554{
555 exit(0);
556 (void) XOpenDisplay("foobar");
557}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
558 AC_MSG_WARN(You may need to check the LIBS line)])])
559if test x$rxvt_cv_rpath != xyes; then
560 changequote(, )dnl
561 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
562 changequote([, ])dnl
563 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
564 AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R,
565[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
566#include <stdlib.h>
567main()
568{
569 exit(0);
570 (void) XOpenDisplay("foobar");
571}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])
572 if test x$rxvt_cv_R != xyes; then
573 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
574 fi
575fi
576
577AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 532AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
578[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])]) 533[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
579if test x$rxvt_cv_xpointer = xyes; then 534if test x$rxvt_cv_xpointer = xyes; then
580 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 535 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
581fi 536fi
582LIBS=$ac_save_LIBS
583CFLAGS=$ac_save_CFLAGS
584 537
585AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, 538AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
586[AC_COMPILE_IFELSE( 539[AC_COMPILE_IFELSE(
587 [AC_LANG_PROGRAM([ 540 [AC_LANG_PROGRAM([
588#define XLIB_ILLEGAL_ACCESS 541#define XLIB_ILLEGAL_ACCESS
695dnl# CHECKING FOR LIBRARY FUNCTIONS 648dnl# CHECKING FOR LIBRARY FUNCTIONS
696dnl# -------------------------------------------------------------------------- 649dnl# --------------------------------------------------------------------------
697AC_TYPE_SIGNAL 650AC_TYPE_SIGNAL
698dnl> AC_FUNC_VPRINTF 651dnl> AC_FUNC_VPRINTF
699 652
700AC_CHECK_FUNCS( \ 653AC_CHECK_FUNCS(unsetenv)
701 unsetenv \
702 setutent \
703 on_exit \
704)
705 654
706UTMP_CHECK 655UTMP_CHECK
707 656
708dnl# -------------------------------------------------------------------------- 657dnl# --------------------------------------------------------------------------
709 658
710dnl# find ttys/ttytab
711AC_CACHE_CHECK(where ttys/ttytab is located, rxvt_cv_path_ttytab,
712[for ttys_file in dnl
713 /etc/ttys /etc/ttytab;
714do
715 if test -f "$ttys_file" ; then
716 rxvt_cv_path_ttytab=$ttys_file
717 break
718 fi
719done
720])
721if test x$rxvt_cv_path_ttytab != x; then
722 AC_DEFINE_UNQUOTED(TTYTAB_FILENAME, "$rxvt_cv_path_ttytab", Define location of ttys/ttytab)
723fi
724
725dnl# -------------------------------------------------------------------------- 659dnl# --------------------------------------------------------------------------
726dnl# -------------------------------------------------------------------------- 660dnl# --------------------------------------------------------------------------
727 661
728dnl# this is a really hack test for some basic Xlocale stuff 662dnl# this is a really hack test for some basic Xlocale stuff
729ac_save_LIBS=$LIBS 663save_LIBS=$LIBS
730ac_save_CFLAGS=$CFLAGS 664save_CFLAGS=$CFLAGS
731CFLAGS="$CFLAGS $X_CFLAGS" 665CFLAGS="$CFLAGS $X_CFLAGS"
732LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 666LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
733if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
734 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
735fi
736AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
737[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
738#include <stdlib.h>
739main() {
740char *p;
741if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
742exit (XSupportsLocale() ? 0 : 1);
743else
744exit (1);}]])],[dnl
745 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
746 :])])
747if test x$support_xim = xyes; then 667if test x$support_xim = xyes; then
668 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
669 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
670 #include <stdlib.h>
671 main() {
672 char *p;
673 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
674 exit (XSupportsLocale() ? 0 : 1);
675 else
676 exit (1);}]])],[dnl
677 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
678 :])])
748 if test x$rxvt_cv_func_xlocale = xyes; then 679 if test x$rxvt_cv_func_xlocale = xyes; then
749 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input) 680 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,
682 [AC_COMPILE_IFELSE([
683 #include <X11/Xlib.h>
684
685 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
686
687 void f() {
688 XIMCallback cb;
689 cb.callback = im_destroy_cb;
690 }
691 ],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)])
692
693 if test x$rxvt_broken_ximcb = xyes; then
694 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
695 fi
750 fi 696 fi
751fi 697fi
752 698
753AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, 699AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
754[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 700[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
755#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) 701#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
756if test x$rxvt_cv_func_xsetlocale = xyes; then 702if test x$rxvt_cv_func_xsetlocale = xyes; then
757 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 703 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
758fi 704fi
759LIBS=$ac_save_LIBS 705LIBS=$save_LIBS
760CFLAGS=$ac_save_CFLAGS 706CFLAGS=$save_CFLAGS
761 707
762AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale, 708AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
763[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])]) 709[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])
764if test x$rxvt_cv_func_setlocale = xyes; then 710if test x$rxvt_cv_func_setlocale = xyes; then
765 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works) 711 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
771 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) 717 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
772fi 718fi
773 719
774SCM_RIGHTS_CHECK 720SCM_RIGHTS_CHECK
775 721
776AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
777[AC_COMPILE_IFELSE([
778#include <X11/Xlib.h>
779
780void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
781
782void f() {
783 XIMCallback cb;
784 cb.callback = im_destroy_cb;
785}
786],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)])
787
788if test x$rxvt_broken_ximcb = xyes; then
789 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
790fi
791
792PTY_CHECK 722PTY_CHECK
793 723
794TTY_GROUP_CHECK 724TTY_GROUP_CHECK
795 725
796dnl# -------------------------------------------------------------------------- 726dnl# --------------------------------------------------------------------------
797dnl# now add and remove other stuff 727dnl# now add and remove other stuff
798dnl# -------------------------------------------------------------------------- 728dnl# --------------------------------------------------------------------------
799if test x$support_xft = xyes; then 729if test x$support_xft = xyes; then
800 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 730 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
801 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 731 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
802 LIBS="$LIBS `$PKG_CONFIG xft --libs`" 732 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
803 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 733 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
804 else 734 else
805 AC_PATH_PROG(XFT_CONFIG, xft-config, no) 735 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
806 if test $XFT_CONFIG != no; then 736 if test $XFT_CONFIG != no; then
807 LIBS="$LIBS `$XFT_CONFIG --libs`" 737 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
808 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 738 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
809 fi 739 fi
810 fi 740 fi
811 741
742 save_LIBS="$LIBS"
743 LIBS="$LIBS $X_LIBS"
812 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 744 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
813 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no]) 745 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
746 LIBS="$save_LIBS"
814 747
815 if test x$support_xft = xyes; then 748 if test x$support_xft = xyes; then
816 AC_DEFINE(XFT, 1, Define to enable xft support) 749 AC_DEFINE(XFT, 1, Define to enable xft support)
817 fi 750 fi
818fi 751fi
826 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences) 759 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
827fi 760fi
828if test x$support_fading = xyes; then 761if test x$support_fading = xyes; then
829 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) 762 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
830fi 763fi
831if test x$support_tinting = xyes; then
832 AC_DEFINE(TINTING, 1, Define if you want your background to be tinted)
833fi
834if test x$support_inheritpixmap = xyes; then 764if test x$support_inheritpixmap = xyes; then
835 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background) 765 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
836fi 766fi
837if test x$support_keepscrolling = xno; then 767if test x$support_keepscrolling = xno; then
838 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) 768 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
847 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) 777 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
848fi 778fi
849if test x$support_mouseslipwheel = xyes; then 779if test x$support_mouseslipwheel = xyes; then
850 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling) 780 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
851fi 781fi
852if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then
853 AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage)
854fi
855
856if test x$support_afterimage = xyes; then 782if test x$support_afterimage = xyes; then
857 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing) 783 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
784 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps. Needs libAfterImage)
858fi 785fi
859 786
860if test x$support_afterstep = xyes; then 787dnl if test x$support_afterstep = xyes; then
861 AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager) 788dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)
862fi 789dnl fi
863 790
864if test x$support_scroll_rxvt = xyes; then 791if test x$support_scroll_rxvt = xyes; then
865 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars) 792 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)
866 scrolltypes="rxvt" 793 scrolltypes="rxvt"
867fi 794fi
946AC_SUBST(PERLPRIVLIBEXP) 873AC_SUBST(PERLPRIVLIBEXP)
947AC_SUBST(PERL) 874AC_SUBST(PERL)
948AC_SUBST(IF_PERL) 875AC_SUBST(IF_PERL)
949AC_SUBST(PERL_O) 876AC_SUBST(PERL_O)
950 877
951if test x$support_perl = xyes; then
952 support_frills=yes
953fi
954
955AC_SUBST(CFLAGS) 878AC_SUBST(CFLAGS)
956AC_SUBST(CPPFLAGS) 879AC_SUBST(CPPFLAGS)
957AC_SUBST(LDFLAGS) 880AC_SUBST(LDFLAGS)
958AC_SUBST(X_CFLAGS) 881AC_SUBST(X_CFLAGS)
959 882
960dnl# Attack the libs 883dnl# Attack the libs
961if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
962 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
963 X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"`
964 X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"`
965 XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"`
966fi
967AC_SUBST(LIBS) 884AC_SUBST(LIBS)
968AC_SUBST(X_LIBS) 885AC_SUBST(X_LIBS)
969AC_SUBST(X_EXTRA_LIBS) 886AC_SUBST(X_EXTRA_LIBS)
970 887
971AC_SUBST(LIBAFTERIMAGE_CFLAGS) 888AC_SUBST(AFTERIMAGE_CFLAGS)
972AC_SUBST(AFTERIMAGE_LIBS) 889AC_SUBST(AFTERIMAGE_LIBS)
973 890
974AC_ARG_PROGRAM 891AC_ARG_PROGRAM
975 892
976dnl# test for "sun" or "__sun__" before include sys_ioctl 893dnl# test for "sun" or "__sun__" before include sys_ioctl
1012 Install path: ${prefix}/bin 929 Install path: ${prefix}/bin
1013 Compiler: $CXX 930 Compiler: $CXX
1014 Compiler flags: $CXXFLAGS 931 Compiler flags: $CXXFLAGS
1015 Linker: $LINKER" 932 Linker: $LINKER"
1016 933
1017if test x$support_xpm = xyes; then
1018 echo " Xpm library: $XPM_LIBS"
1019fi
1020
1021if test x$support_afterimage = xyes; then
1022 echo " AfterImage support: yes"
1023fi
1024
1025if test x$support_afterstep = xyes; then
1026 echo " AfterStep integration: yes"
1027fi
1028
1029if test x$term != x; then 934if test x$term != x; then
1030 echo " set TERM to: $term" 935 echo " set TERM to: $term"
1031fi 936fi
1032if test x$terminfo != x; then 937if test x$terminfo != x; then
1033 echo " set TERMINFO to: $terminfo" 938 echo " set TERMINFO to: $terminfo"
1037if test x$RESFALLBACK != x; then 942if test x$RESFALLBACK != x; then
1038 echo " resource class fallback: $RESFALLBACK" 943 echo " resource class fallback: $RESFALLBACK"
1039fi 944fi
1040echo 945echo
1041echo " embedded perl: $support_perl" 946echo " embedded perl: $support_perl"
947echo " libafterimage: $support_afterimage"
948dnl echo " AfterStep integration: $support_afterstep"
1042echo 949echo
1043if test x$support_xpm = xneedsmanualspecification; then
1044 echo ".----------------------------------------------------------------."
1045 echo ". WARNING: --enable-xpm-background was specified however the ."
1046 echo ". XPM includes files and libraries could not be found. ."
1047 echo ". XPM backgrounds are now being DISABLED! If you want ."
1048 echo ". to use them you should rerun configure with the ."
1049 echo ". appropriate --with-xpm-includes=/path/to/xpm/includes ."
1050 echo ". and --with-xpm-library=/path/to/xpm/library lines. ."
1051 echo ".----------------------------------------------------------------."
1052fi
1053if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then 950if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then
1054 echo ".----------------------------------------------------------------." 951 echo ".----------------------------------------------------------------."
1055 echo ". WARNING: --enable-xim was specified however the locale support ." 952 echo ". WARNING: --enable-xim was specified however the locale support ."
1056 echo ". functions could not be found. ." 953 echo ". functions could not be found. ."
1057 echo ". XIM is now being DISABLED! ." 954 echo ". XIM is now being DISABLED! ."

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines