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.42 by ayin, Sat Jun 9 11:19:36 2007 UTC vs.
Revision 1.80 by ayin, Mon Nov 5 00:19:14 2007 UTC

… …
62dnl# -------------------------------------------------------------------------- 62dnl# --------------------------------------------------------------------------
63dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' 63dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
64dnl# 64dnl#
65if test -z "$orig_CXXFLAGS"; then 65if test -z "$orig_CXXFLAGS"; then
66 if test x$GCC = xyes && test "x$GXX" = xyes; then 66 if test x$GCC = xyes && test "x$GXX" = xyes; then
67 CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs" 67 CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs"
68 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"]) 68 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"])
69 else 69 else
70 CXXFLAGS="-O" 70 CXXFLAGS="-O"
71 fi 71 fi
72 CFLAGS="$CXXFLAGS" 72 CFLAGS="$CXXFLAGS"
… …
74 74
75AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.) 75AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)
76 76
77case $host in 77case $host in
78 *-*-solaris* ) 78 *-*-solaris* )
79 AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris) 79 AC_DEFINE(_XOPEN_SOURCE, 500, Needed to get declarations for msg_control and msg_controllen on Solaris)
80 AC_DEFINE(_XOPEN_SOURCE, 2, Needed to get declarations for msg_control and msg_controllen on Solaris)
81 AC_DEFINE(__EXTENSIONS__, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
82 ;; 80 ;;
83esac 81esac
84 82
85dnl if test x$GXX = xyes; then 83dnl if test x$GXX = xyes; then
86dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now... 84dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now...
… …
97dnl AC_ENABLE_STATIC(yes)dnl# libtool 95dnl AC_ENABLE_STATIC(yes)dnl# libtool
98dnl AC_PROG_LIBTOOL()dnl# libtool 96dnl AC_PROG_LIBTOOL()dnl# libtool
99 97
100support_frills=yes 98support_frills=yes
101support_inheritpixmap=yes 99support_inheritpixmap=yes
102support_tinting=yes
103support_fading=yes 100support_fading=yes
104support_keepscrolling=yes 101support_keepscrolling=yes
105support_selectionscrolling=yes 102support_selectionscrolling=yes
106support_mousewheel=yes 103support_mousewheel=yes
107support_mouseslipwheel=yes 104support_mouseslipwheel=yes
… …
110support_scroll_rxvt=yes 107support_scroll_rxvt=yes
111support_scroll_next=yes 108support_scroll_next=yes
112support_scroll_xterm=yes 109support_scroll_xterm=yes
113support_scroll_plain=yes 110support_scroll_plain=yes
114support_xim=yes 111support_xim=yes
115support_xpm=yes
116support_afterimage=yes 112support_afterimage=yes
117support_afterstep=yes 113support_afterstep=yes
118support_xft=yes 114support_xft=yes
119support_unicode3=no 115support_unicode3=no
120support_combining=yes 116support_combining=yes
… …
140 NOTE: automatically enabled with --enable-shared], 136 NOTE: automatically enabled with --enable-shared],
141 [ 137 [
142 if test x$enableval = xno; then 138 if test x$enableval = xno; then
143 support_frills=no 139 support_frills=no
144 support_inheritpixmap=no 140 support_inheritpixmap=no
145 support_tinting=no
146 support_fading=no 141 support_fading=no
147 support_keepscrolling=no 142 support_keepscrolling=no
148 support_selectionscrolling=no 143 support_selectionscrolling=no
149 support_lastlog=no 144 support_lastlog=no
150 support_mousewheel=no 145 support_mousewheel=no
… …
156 support_scroll_xterm=no 151 support_scroll_xterm=no
157 support_scroll_plain=no 152 support_scroll_plain=no
158 support_utmp=no 153 support_utmp=no
159 support_wtmp=no 154 support_wtmp=no
160 support_xim=no 155 support_xim=no
161 support_xpm=no
162 support_afterimage=no 156 support_afterimage=no
163 support_afterstep=no 157 support_afterstep=no
164 support_xft=no 158 support_xft=no
165 support_unicode3=no 159 support_unicode3=no
166 support_combining=no 160 support_combining=no
… …
171 codesets= 165 codesets=
172 fi 166 fi
173 if test x$enableval = xyes; then 167 if test x$enableval = xyes; then
174 support_frills=yes 168 support_frills=yes
175 support_inheritpixmap=yes 169 support_inheritpixmap=yes
176 support_tinting=yes
177 support_fading=yes 170 support_fading=yes
178 support_keepscrolling=yes 171 support_keepscrolling=yes
179 support_selectionscrolling=yes 172 support_selectionscrolling=yes
180 support_lastlog=yes 173 support_lastlog=yes
181 support_mousewheel=yes 174 support_mousewheel=yes
… …
187 support_scroll_xterm=yes 180 support_scroll_xterm=yes
188 support_scroll_plain=yes 181 support_scroll_plain=yes
189 support_utmp=yes 182 support_utmp=yes
190 support_wtmp=yes 183 support_wtmp=yes
191 support_xim=yes 184 support_xim=yes
192 support_xpm=yes
193 support_afterimage=yes 185 support_afterimage=yes
194 support_afterstep=yes 186 support_afterstep=yes
195 support_xft=yes 187 support_xft=yes
196 support_unicode3=yes 188 support_unicode3=yes
197 support_combining=yes 189 support_combining=yes
… …
201 support_perl=yes 193 support_perl=yes
202 codesets=all 194 codesets=all
203 fi 195 fi
204 ]) 196 ])
205 197
198WARNINGS=no
199AC_ARG_ENABLE(warnings,
200 [ --enable-warnings turn on g++ warnings],
201 [if test x$enableval = xyes; then
202 WARNINGS=yes
203 fi])
204if test x$GXX = xyes; then
205 if test $WARNINGS = yes; then
206 save_CXXFLAGS="$CXXFLAGS"
207 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor"
208 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"])
209 else
210 CXXFLAGS="$CXXFLAGS -w"
211 fi
212fi
213
206AC_ARG_ENABLE(unicode3, 214AC_ARG_ENABLE(unicode3,
207 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters], 215 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters],
208 [if test x$enableval = xyes -o x$enableval = xno; then 216 [if test x$enableval = xyes -o x$enableval = xno; then
209 support_unicode3=$enableval 217 support_unicode3=$enableval
210 fi]) 218 fi])
… …
225 [ --enable-font-styles enable bold and italic support], 233 [ --enable-font-styles enable bold and italic support],
226 [if test x$enableval = xyes -o x$enableval = xno; then 234 [if test x$enableval = xyes -o x$enableval = xno; then
227 support_styles=$enableval 235 support_styles=$enableval
228 fi]) 236 fi])
229 237
230AC_ARG_ENABLE(xpm-background,
231 [ --enable-xpm-background enable background pixmaps],
232 [if test x$enableval = xyes -o x$enableval = xno; then
233 support_xpm=$enableval
234 fi])
235
236AC_ARG_ENABLE(afterimage, 238AC_ARG_ENABLE(afterimage,
237 [ --enable-afterimage enable integration with libAfterImage for background images], 239 [ --enable-afterimage enable integration with libAfterImage for background images],
238 [if test x$enableval = xyes -o x$enableval = xno; then 240 [if test x$enableval = xyes -o x$enableval = xno; then
239 support_afterimage=$enableval 241 support_afterimage=$enableval
240 fi]) 242 fi])
241 243
242AC_ARG_WITH(afterimage_config, 244AC_ARG_WITH(afterimage_config,
243 [ --with-afterimage-config=DIR use libAfterImage config script in DIR], 245 [ --with-afterimage-config=DIR use libAfterImage config script in DIR],
244 [afterimage_config="$withval"]) 246 [if test "x$withval" != x; then
247 afterimage_config=$withval/afterimage-config
248 fi])
245 249
246AC_ARG_ENABLE(afterstep, 250dnl AC_ARG_ENABLE(afterstep,
247 [ --enable-afterstep enable integration with AfterStep window manager], 251dnl [ --enable-afterstep enable integration with AfterStep window manager],
248 [if test x$enableval = xyes -o x$enableval = xno; then 252dnl [if test x$enableval = xyes -o x$enableval = xno; then
249 support_afterstep=$enableval 253dnl support_afterstep=$enableval
250 fi]) 254dnl fi])
251 255
252AC_ARG_ENABLE(transparency, 256AC_ARG_ENABLE(transparency,
253 [ --enable-transparency enable transparent backgrounds], 257 [ --enable-transparency enable transparent backgrounds],
254 [if test x$enableval = xyes -o x$enableval = xno; then 258 [if test x$enableval = xyes -o x$enableval = xno; then
255 support_inheritpixmap=$enableval 259 support_inheritpixmap=$enableval
256 fi]) 260 fi])
257 261
258AC_ARG_ENABLE(tinting,
259 [ --enable-tinting enable tinting of transparent bg],
260 [if test x$enableval = xyes -o x$enableval = xno; then
261 support_tinting=$enableval
262 fi])
263
264AC_ARG_ENABLE(fading, 262AC_ARG_ENABLE(fading,
265 [ --enable-fading enable colors fading when off focus], 263 [ --enable-fading enable colors fading when off focus],
266 [if test x$enableval = xyes -o x$enableval = xno; then 264 [if test x$enableval = xyes -o x$enableval = xno; then
267 support_fading=$enableval 265 support_fading=$enableval
268 fi]) 266 fi])
… …
296 [if test x$enableval = xyes -o x$enableval = xno; then 294 [if test x$enableval = xyes -o x$enableval = xno; then
297 support_scroll_plain=$enableval 295 support_scroll_plain=$enableval
298 fi]) 296 fi])
299 297
300AC_ARG_WITH(codesets, 298AC_ARG_WITH(codesets,
301 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)], 299 [ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
302 [codesets="$withval"]) 300 [codesets="$withval"])
303 301
304AC_ARG_ENABLE(xim, 302AC_ARG_ENABLE(xim,
305 [ --enable-xim XIM (X Input Method) protocol support], 303 [ --enable-xim XIM (X Input Method) protocol support],
306 [if test x$enableval = xyes -o x$enableval = xno; then 304 [if test x$enableval = xyes -o x$enableval = xno; then
… …
331 support_8bitctrls=$enableval 329 support_8bitctrls=$enableval
332 fi]) 330 fi])
333 331
334RESFALLBACK=Rxvt 332RESFALLBACK=Rxvt
335AC_ARG_ENABLE(fallback, 333AC_ARG_ENABLE(fallback,
336 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)], 334 [ --enable-fallback@<:@=CLASS@:>@ fall back on CLASS resources in addition to URxvt ones (default: Rxvt)],
337 [ 335 [
338 test x$enableval = xyes && enableval=Rxvt 336 test x$enableval = xyes && enableval=Rxvt
339 test x$enableval = xno && enableval= 337 test x$enableval = xno && enableval=
340 RESFALLBACK="$enableval" 338 RESFALLBACK="$enableval"
341 ]) 339 ])
… …
400 [if test x$enableval = xyes -o x$enableval = xno; then 398 [if test x$enableval = xyes -o x$enableval = xno; then
401 support_mousewheel=$enableval 399 support_mousewheel=$enableval
402 fi]) 400 fi])
403 401
404AC_ARG_ENABLE(slipwheeling, 402AC_ARG_ENABLE(slipwheeling,
405 [ --enable-slipwheeling enable slip wheel scrolling (requires previous)], 403 [ --enable-slipwheeling enable slip wheel scrolling (requires --enable-mousewheel)],
406 [if test x$enableval = xyes -o x$enableval = xno; then 404 [if test x$enableval = xyes -o x$enableval = xno; then
407 support_mouseslipwheel=$enableval 405 support_mouseslipwheel=$enableval
408 fi]) 406 fi])
409 407
410AC_ARG_ENABLE(smart-resize, 408AC_ARG_ENABLE(smart-resize,
… …
437 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" 435 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
438 fi]) 436 fi])
439 437
440dnl# -------------------------------------------------------------------------- 438dnl# --------------------------------------------------------------------------
441 439
442AC_PATH_PROG(MV, mv, mv)
443AC_PATH_PROG(CP, cp, cp)
444AC_PATH_PROG(LN, ln, ln)
445AC_PATH_PROG(SED, sed, sed)
446AC_PATH_PROG(ECHO, echo, echo)
447AC_PATH_PROG(CMP, cmp, cmp)
448AC_PATH_PROG(TIC, tic) 440AC_PATH_PROG(TIC, tic, :)
449 441
450dnl# need a neat way to detect SVR4 or its features 442dnl# need a neat way to detect SVR4 or its features
451dnl# in src/command.c we use these functions: 443dnl# in src/command.c we use these functions:
452dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> 444dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
453dnl# - but are these also defined for other systems? 445dnl# - but are these also defined for other systems?
… …
460dnl## #endif 452dnl## #endif
461dnl## ], [AC_MSG_RESULT(yes); AC_DEFINE(PERHAPS_SVR4)], AC_MSG_RESULT(perhaps not?)) 453dnl## ], [AC_MSG_RESULT(yes); AC_DEFINE(PERHAPS_SVR4)], AC_MSG_RESULT(perhaps not?))
462 454
463AC_PATH_XTRA 455AC_PATH_XTRA
464 456
465dnl# the only reasonable way to find libXpm is do-it-yourself
466dnl# only check if we want xpm-background
467
468LIBAFTERIMAGE_CFLAGS= 457AFTERIMAGE_CFLAGS=
469AFTERIMAGE_LIBS= 458AFTERIMAGE_LIBS=
470have_afterimage= 459AFTERIMAGE_VERSION=
471 460
472if test x$support_afterimage == xyes; then 461if test x$support_afterimage = xyes; then
473 AC_MSG_CHECKING(installed libAfterImage)
474 support_afterimage=no 462 support_afterimage=no
463
475 if test "x$afterimage_config" = "x" ; then 464 if test "x$afterimage_config" = "x" ; then
476 if afterimage-config --version > /dev/null 2>&1 ; then
477 afterimage_config=afterimage-config 465 AC_PATH_PROG(afterimage_config, afterimage-config, no)
478 else 466 fi
479 if test -x /usr/local/bin/afterimage-config; then 467 if test "x$afterimage_config" != "xno" ; then
480 afterimage_config=/usr/local/bin/afterimage-config 468 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
469 xAFTERIMAGE_VERSION=`$afterimage_config --version`
470 if test -n "$xAFTERIMAGE_VERSION" ; then
471 xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
472 xAFTERIMAGE_LIBS=`$afterimage_config --libs`
473 if test "x$xAFTERIMAGE_LIBS" != "x"; then
474 libai_ver_major=`echo $xAFTERIMAGE_VERSION | cut -f 1 -d .`
475 libai_ver_minor=`echo $xAFTERIMAGE_VERSION | cut -f 2 -d .`
476 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then
477 support_afterimage=yes
478 AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS"
479 AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS"
480 AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION"
481 fi
481 fi 482 fi
482 fi 483 fi
484 if test "x$support_afterimage" = "xyes"; then
485 AC_MSG_RESULT($AFTERIMAGE_LIBS)
483 else 486 else
484 afterimage_config=$afterimage_config/afterimage-config 487 AC_MSG_RESULT(no)
485 fi
486 if $afterimage_config --version > /dev/null 2>&1 ; then
487 LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
488 AFTERIMAGE_LIBS=`$afterimage_config --libs`
489 if test "x$AFTERIMAGE_LIBS" != "x"; then
490 support_afterimage=yes
491 fi 488 fi
492 fi
493
494 if test "x$support_afterimage" = "xyes"; then
495 AC_MSG_RESULT($AFTERIMAGE_LIBS)
496 else
497 AC_MSG_RESULT(afterimage-config not found in $afterimage_config - can't use libAfterImage for images.)
498 fi
499fi
500
501if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then
502 VT_FIND_LIBXPM
503 if test x$no_xpm = xyes; then
504 support_xpm=needsmanualspecification
505 fi 489 fi
506fi 490fi
507 491
508dnl# -------------------------------------------------------------------------- 492dnl# --------------------------------------------------------------------------
509dnl# CHECKING FOR HEADER FILES 493dnl# CHECKING FOR HEADER FILES
… …
537#include <sys/ioctl.h> 521#include <sys/ioctl.h>
538#ifdef HAVE_TERMIOS_H 522#ifdef HAVE_TERMIOS_H
539#include <termios.h> 523#include <termios.h>
540#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])]) 524#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
541 525
542dnl# ELF systems may want to store paths for dynamic libraries.
543dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath"
544dnl# At least one version of SunOS wants "-R path" but it's not checked yet.
545if test -n "$GCC"; then
546 LDARG="-Wl,"
547else
548 LDARG=""
549fi
550changequote(, )dnl
551R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-rpath '$LDARG'\1/g'
552changequote([, ])dnl
553
554ac_save_CFLAGS=$CFLAGS
555ac_save_LIBS=$LIBS
556CFLAGS="$CFLAGS $X_CFLAGS"
557LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
558AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath,
559[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
560#include <stdlib.h>
561main()
562{
563 exit(0);
564 (void) XOpenDisplay("foobar");
565}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
566 AC_MSG_WARN(You may need to check the LIBS line)])])
567if test x$rxvt_cv_rpath != xyes; then
568 changequote(, )dnl
569 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
570 changequote([, ])dnl
571 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
572 AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R,
573[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
574#include <stdlib.h>
575main()
576{
577 exit(0);
578 (void) XOpenDisplay("foobar");
579}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])
580 if test x$rxvt_cv_R != xyes; then
581 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
582 fi
583fi
584
585AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 526AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
586[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])]) 527[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
587if test x$rxvt_cv_xpointer = xyes; then 528if test x$rxvt_cv_xpointer = xyes; then
588 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 529 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
589fi 530fi
590LIBS=$ac_save_LIBS
591CFLAGS=$ac_save_CFLAGS
592 531
593AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, 532AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
594[AC_COMPILE_IFELSE( 533[AC_COMPILE_IFELSE(
595 [AC_LANG_PROGRAM([ 534 [AC_LANG_PROGRAM([
596#define XLIB_ILLEGAL_ACCESS 535#define XLIB_ILLEGAL_ACCESS
… …
703dnl# CHECKING FOR LIBRARY FUNCTIONS 642dnl# CHECKING FOR LIBRARY FUNCTIONS
704dnl# -------------------------------------------------------------------------- 643dnl# --------------------------------------------------------------------------
705AC_TYPE_SIGNAL 644AC_TYPE_SIGNAL
706dnl> AC_FUNC_VPRINTF 645dnl> AC_FUNC_VPRINTF
707 646
708AC_CHECK_FUNCS( \ 647AC_CHECK_FUNCS(unsetenv)
709 unsetenv \
710 setutent \
711 on_exit \
712)
713 648
714UTMP_CHECK 649UTMP_CHECK
715 650
716dnl# -------------------------------------------------------------------------- 651dnl# --------------------------------------------------------------------------
717 652
… …
732 667
733dnl# -------------------------------------------------------------------------- 668dnl# --------------------------------------------------------------------------
734dnl# -------------------------------------------------------------------------- 669dnl# --------------------------------------------------------------------------
735 670
736dnl# this is a really hack test for some basic Xlocale stuff 671dnl# this is a really hack test for some basic Xlocale stuff
737ac_save_LIBS=$LIBS 672save_LIBS=$LIBS
738ac_save_CFLAGS=$CFLAGS 673save_CFLAGS=$CFLAGS
739CFLAGS="$CFLAGS $X_CFLAGS" 674CFLAGS="$CFLAGS $X_CFLAGS"
740LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 675LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
741if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then 676if test x$support_xim = xyes; then
742 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
743fi
744AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 677 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
745[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 678 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
746#include <stdlib.h> 679 #include <stdlib.h>
747main() { 680 main() {
748char *p; 681 char *p;
749if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 682 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
750exit (XSupportsLocale() ? 0 : 1); 683 exit (XSupportsLocale() ? 0 : 1);
751else 684 else
752exit (1);}]])],[dnl 685 exit (1);}]])],[dnl
753 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 686 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
754 AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])]) 687 :])])
755if test x$rxvt_cv_func_xlocale = xyes; then 688 if test x$rxvt_cv_func_xlocale = xyes; then
756 AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works) 689 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
690 AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
691 [AC_COMPILE_IFELSE([
692 #include <X11/Xlib.h>
693
694 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
695
696 void f() {
697 XIMCallback cb;
698 cb.callback = im_destroy_cb;
699 }
700 ],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)])
701
702 if test x$rxvt_broken_ximcb = xyes; then
703 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
704 fi
705 fi
757fi 706fi
758 707
759AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, 708AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
760[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 709[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
761#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) 710#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
762if test x$rxvt_cv_func_xsetlocale = xyes; then 711if test x$rxvt_cv_func_xsetlocale = xyes; then
763 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 712 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
764fi 713fi
765LIBS=$ac_save_LIBS 714LIBS=$save_LIBS
766CFLAGS=$ac_save_CFLAGS 715CFLAGS=$save_CFLAGS
767 716
768AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale, 717AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
769[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])]) 718[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])
770if test x$rxvt_cv_func_setlocale = xyes; then 719if test x$rxvt_cv_func_setlocale = xyes; then
771 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works) 720 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
… …
776if test x$rxvt_cv_func_nl_langinfo = xyes; then 725if test x$rxvt_cv_func_nl_langinfo = xyes; then
777 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) 726 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
778fi 727fi
779 728
780SCM_RIGHTS_CHECK 729SCM_RIGHTS_CHECK
781
782AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
783[AC_COMPILE_IFELSE([
784#include <X11/Xlib.h>
785
786void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
787
788void f() {
789 XIMCallback cb;
790 cb.callback = im_destroy_cb;
791}
792],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)])
793
794if test x$rxvt_broken_ximcb = xyes; then
795 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
796fi
797 730
798PTY_CHECK 731PTY_CHECK
799 732
800TTY_GROUP_CHECK 733TTY_GROUP_CHECK
801 734
… …
832 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences) 765 AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
833fi 766fi
834if test x$support_fading = xyes; then 767if test x$support_fading = xyes; then
835 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) 768 AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
836fi 769fi
837if test x$support_tinting = xyes; then
838 AC_DEFINE(TINTING, 1, Define if you want your background to be tinted)
839fi
840if test x$support_inheritpixmap = xyes; then 770if test x$support_inheritpixmap = xyes; then
841 AC_DEFINE(TRANSPARENT, 1, Define if you want your background to use the parent window background) 771 AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
842fi 772fi
843if test x$support_keepscrolling = xno; then 773if test x$support_keepscrolling = xno; then
844 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) 774 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
845fi 775fi
846if test x$support_selectionscrolling = xyes; then 776if test x$support_selectionscrolling = xyes; then
… …
853 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) 783 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
854fi 784fi
855if test x$support_mouseslipwheel = xyes; then 785if test x$support_mouseslipwheel = xyes; then
856 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling) 786 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
857fi 787fi
858if test x$support_xim = xyes -o x$multichar_set = xyes; then
859 if test x$rxvt_cv_func_xlocale = xyes; then
860 AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
861 fi
862fi
863if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then
864 AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage)
865fi
866
867if test x$support_afterimage = xyes; then 788if test x$support_afterimage = xyes; then
868 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing) 789 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
790 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps. Needs libAfterImage)
869fi 791fi
870 792
871if test x$support_afterstep = xyes; then 793dnl if test x$support_afterstep = xyes; then
872 AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager) 794dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)
873fi 795dnl fi
874 796
875if test x$support_scroll_rxvt = xyes; then 797if test x$support_scroll_rxvt = xyes; then
876 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars) 798 AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)
877 scrolltypes="rxvt" 799 scrolltypes="rxvt"
878fi 800fi
… …
957AC_SUBST(PERLPRIVLIBEXP) 879AC_SUBST(PERLPRIVLIBEXP)
958AC_SUBST(PERL) 880AC_SUBST(PERL)
959AC_SUBST(IF_PERL) 881AC_SUBST(IF_PERL)
960AC_SUBST(PERL_O) 882AC_SUBST(PERL_O)
961 883
962if test x$support_perl = xyes; then
963 support_frills=yes
964fi
965
966AC_SUBST(DEBUG)
967AC_SUBST(DINCLUDE)
968AC_SUBST(CFLAGS) 884AC_SUBST(CFLAGS)
969AC_SUBST(CPPFLAGS) 885AC_SUBST(CPPFLAGS)
970AC_SUBST(LDFLAGS) 886AC_SUBST(LDFLAGS)
971AC_SUBST(X_CFLAGS) 887AC_SUBST(X_CFLAGS)
972 888
973dnl# Attack the libs 889dnl# Attack the libs
974if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
975 DLIB=`echo $DLIB | sed "$R_TRANSLATE"`
976 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
977 X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"`
978 X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"`
979 XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"`
980fi
981AC_SUBST(DLIB)
982AC_SUBST(LIBS) 890AC_SUBST(LIBS)
983AC_SUBST(X_LIBS) 891AC_SUBST(X_LIBS)
984AC_SUBST(X_EXTRA_LIBS) 892AC_SUBST(X_EXTRA_LIBS)
985 893
986AC_SUBST(LIBAFTERIMAGE_CFLAGS) 894AC_SUBST(AFTERIMAGE_CFLAGS)
987AC_SUBST(AFTERIMAGE_LIBS) 895AC_SUBST(AFTERIMAGE_LIBS)
988 896
989AC_ARG_PROGRAM 897AC_ARG_PROGRAM
990 898
991dnl# test for "sun" or "__sun__" before include sys_ioctl 899dnl# test for "sun" or "__sun__" before include sys_ioctl
… …
1027 Install path: ${prefix}/bin 935 Install path: ${prefix}/bin
1028 Compiler: $CXX 936 Compiler: $CXX
1029 Compiler flags: $CXXFLAGS 937 Compiler flags: $CXXFLAGS
1030 Linker: $LINKER" 938 Linker: $LINKER"
1031 939
1032if test x$support_xpm = xyes; then
1033 echo " Xpm library: $XPM_LIBS"
1034fi
1035
1036if test x$support_afterimage = xyes; then
1037 echo " AfterImage library: $AFTERIMAGE_LIBS"
1038fi
1039
1040if test x$support_afterstep = xyes; then
1041 echo " With AfterStep integration"
1042fi
1043
1044if test x$term != x; then 940if test x$term != x; then
1045 echo " set TERM to: $term" 941 echo " set TERM to: $term"
1046fi 942fi
1047if test x$terminfo != x; then 943if test x$terminfo != x; then
1048 echo " set TERMINFO to: $terminfo" 944 echo " set TERMINFO to: $terminfo"
… …
1052if test x$RESFALLBACK != x; then 948if test x$RESFALLBACK != x; then
1053 echo " resource class fallback: $RESFALLBACK" 949 echo " resource class fallback: $RESFALLBACK"
1054fi 950fi
1055echo 951echo
1056echo " embedded perl: $support_perl" 952echo " embedded perl: $support_perl"
953echo " libafterimage: $support_afterimage"
954dnl echo " AfterStep integration: $support_afterstep"
1057echo 955echo
1058if test x$support_xpm = xneedsmanualspecification; then
1059 echo ".----------------------------------------------------------------."
1060 echo ". WARNING: --enable-xpm-background was specified however the ."
1061 echo ". XPM includes files and libraries could not be found. ."
1062 echo ". XPM backgrounds are now being DISABLED! If you want ."
1063 echo ". to use them you should rerun configure with the ."
1064 echo ". appropriate --with-xpm-includes=/path/to/xpm/includes ."
1065 echo ". and --with-xpm-library=/path/to/xpm/library lines. ."
1066 echo ".----------------------------------------------------------------."
1067fi
1068if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then 956if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then
1069 echo ".----------------------------------------------------------------." 957 echo ".----------------------------------------------------------------."
1070 echo ". WARNING: --enable-xim was specified however the locale support ." 958 echo ". WARNING: --enable-xim was specified however the locale support ."
1071 echo ". functions could not be found. ." 959 echo ". functions could not be found. ."
1072 echo ". XIM is now being DISABLED! ." 960 echo ". XIM is now being DISABLED! ."

Diff Legend

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