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.106 by root, Sat Dec 26 10:24:04 2009 UTC vs.
Revision 1.112 by sf-exg, Thu Jul 22 15:42:49 2010 UTC

… …
32AC_AIX 32AC_AIX
33AC_GNU_SOURCE 33AC_GNU_SOURCE
34AC_ISC_POSIX 34AC_ISC_POSIX
35AC_LANG(C++) 35AC_LANG(C++)
36 36
37dnl check wether we can link with gcc -lsupc++ 37dnl check whether we can link with gcc -lsupc++
38if test x$GCC = xyes && test x$GXX = xyes; then 38if test x$GCC = xyes && test x$GXX = xyes; then
39 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
40 AC_MSG_CHECKING([for working libsupc++]) 40 AC_MSG_CHECKING([for working libsupc++])
41 save_CXX="$CXX" 41 save_CXX="$CXX"
42 save_LIBS="$LIBS" 42 save_LIBS="$LIBS"
… …
74 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)
75 ;; 75 ;;
76esac 76esac
77 77
78dnl# FreeBSD needs to link libxpg4 78dnl# FreeBSD needs to link libxpg4
79AC_CHECK_FUNC(setlocale, [], [AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])]) 79AC_SEARCH_LIBS(setlocale, xpg4)
80 80
81dnl# solaris needs to link libnsl and socket 81dnl# solaris needs to link libnsl and socket
82AC_CHECK_FUNC(gethostbyname, [], [AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])]) 82AC_SEARCH_LIBS(gethostbyname, nsl)
83AC_CHECK_FUNC(socket, [], [AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])]) 83AC_SEARCH_LIBS(socket, socket)
84 84
85support_frills=yes 85support_frills=yes
86support_inheritpixmap=yes 86support_inheritpixmap=yes
87support_fading=yes 87support_fading=yes
88support_keepscrolling=yes 88support_keepscrolling=yes
… …
196 else 196 else
197 CXXFLAGS="$CXXFLAGS -w" 197 CXXFLAGS="$CXXFLAGS -w"
198 fi 198 fi
199fi 199fi
200 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
201AC_ARG_ENABLE(unicode3, 211AC_ARG_ENABLE(unicode3,
202 [ --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],
203 [if test x$enableval = xyes -o x$enableval = xno; then 213 [if test x$enableval = xyes -o x$enableval = xno; then
204 support_unicode3=$enableval 214 support_unicode3=$enableval
205 fi]) 215 fi])
… …
397 [if test x$enableval = xyes -o x$enableval = xno; then 407 [if test x$enableval = xyes -o x$enableval = xno; then
398 support_text_blink=$enableval 408 support_text_blink=$enableval
399 fi]) 409 fi])
400 410
401AC_ARG_ENABLE(pointer-blank, 411AC_ARG_ENABLE(pointer-blank,
402 [ --enable-pointer-blank enable pointer blank when typing or inactive pointer], 412 [ --enable-pointer-blank enable pointer blanking when typing or inactive],
403 [if test x$enableval = xyes -o x$enableval = xno; then 413 [if test x$enableval = xyes -o x$enableval = xno; then
404 support_pointer_blank=$enableval 414 support_pointer_blank=$enableval
405 fi]) 415 fi])
406 416
407AC_ARG_WITH(term, 417AC_ARG_WITH(term,
… …
479[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])])
480if test x$rxvt_cv_xpointer = xyes; then 490if test x$rxvt_cv_xpointer = xyes; then
481 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 491 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
482fi 492fi
483 493
484AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, 494AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
485[AC_COMPILE_IFELSE( 495[AC_COMPILE_IFELSE(
486 [AC_LANG_PROGRAM([ 496 [AC_LANG_PROGRAM([
487#define XLIB_ILLEGAL_ACCESS 497#define XLIB_ILLEGAL_ACCESS
488#include <X11/Xlib.h> 498#include <X11/Xlib.h>
489 ],[ 499 ],[
490 Display *dpy; 500 Display *dpy;
491 dpy->xdefaults = (char *)0; 501 dpy->xdefaults = (char *)0;
492 ])], 502 ])],
493 [rxvt_xlib_illegal_access=yes],[rxvt_xlib_illegal_access=no] 503 [rxvt_cv_xlib_illegal_access=yes],[rxvt_cv_xlib_illegal_access=no]
494)]) 504)])
495if test x$rxvt_xlib_illegal_access = xyes; then 505if test x$rxvt_cv_xlib_illegal_access = xyes; then
496 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)
497fi 507fi
498 508
499dnl# -------------------------------------------------------------------------- 509dnl# --------------------------------------------------------------------------
500dnl# CHECKING FOR MISSING TYPEDEFS 510dnl# CHECKING FOR MISSING TYPEDEFS
… …
537 exit (1);}]])],[dnl 547 exit (1);}]])],[dnl
538 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl 548 rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
539 :])]) 549 :])])
540 if test x$rxvt_cv_func_xlocale = xyes; then 550 if test x$rxvt_cv_func_xlocale = xyes; then
541 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)
542 AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb, 552 AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
543 [AC_COMPILE_IFELSE([ 553 [AC_COMPILE_IFELSE([
544 #include <X11/Xlib.h> 554 #include <X11/Xlib.h>
545 555
546 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); 556 void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
547 557
548 void f() { 558 void f() {
549 XIMCallback cb; 559 XIMCallback cb;
550 cb.callback = im_destroy_cb; 560 cb.callback = im_destroy_cb;
551 } 561 }
552 ],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)]) 562 ],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
553 563
554 if test x$rxvt_broken_ximcb = xyes; then 564 if test x$rxvt_cv_broken_ximcb = xyes; then
555 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.)
556 fi 566 fi
557 fi 567 fi
558fi 568fi
559 569
… …
733AC_SUBST(PERLPRIVLIBEXP) 743AC_SUBST(PERLPRIVLIBEXP)
734AC_SUBST(PERL) 744AC_SUBST(PERL)
735AC_SUBST(IF_PERL) 745AC_SUBST(IF_PERL)
736AC_SUBST(PERL_O) 746AC_SUBST(PERL_O)
737 747
738AC_SUBST(CFLAGS)
739AC_SUBST(CPPFLAGS)
740AC_SUBST(LDFLAGS)
741AC_SUBST(X_CFLAGS)
742 748
743dnl# Attack the libs 749dnl# Attack the libs
744AC_SUBST(LIBS)
745AC_SUBST(X_LIBS)
746AC_SUBST(X_EXTRA_LIBS)
747 750
748AC_SUBST(AFTERIMAGE_CFLAGS) 751AC_SUBST(AFTERIMAGE_CFLAGS)
749AC_SUBST(AFTERIMAGE_LIBS) 752AC_SUBST(AFTERIMAGE_LIBS)
750 753
751AC_ARG_PROGRAM 754AC_ARG_PROGRAM

Diff Legend

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