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.82 by root, Sun Nov 11 04:08:00 2007 UTC vs.
Revision 1.88 by ayin, Mon Dec 10 23:27: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"
27 28
28dnl# Checks for programs. 29dnl# Checks for programs.
29dnl AC_MAKE_SET
30
31AC_PROG_CC 30AC_PROG_CC
32AC_PROG_CXX 31AC_PROG_CXX
33AC_PROG_CPP 32AC_PROG_CPP
34AC_PROG_INSTALL 33AC_PROG_INSTALL
35 34
… …
62dnl# -------------------------------------------------------------------------- 61dnl# --------------------------------------------------------------------------
63dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' 62dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
64dnl# 63dnl#
65if test -z "$orig_CXXFLAGS"; then 64if test -z "$orig_CXXFLAGS"; then
66 if test x$GCC = xyes && test "x$GXX" = xyes; then 65 if test x$GCC = xyes && test "x$GXX" = xyes; then
67 CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs" 66 CXXFLAGS="-g -O3 -fno-rtti -fvisibility-inlines-hidden -fno-threadsafe-statics -fno-enforce-eh-specs"
68 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"]) 67 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"])
69 else 68 else
70 CXXFLAGS="-O" 69 CXXFLAGS="-O"
71 fi 70 fi
72 CFLAGS="$CXXFLAGS" 71 CFLAGS="$CXXFLAGS"
… …
130fi 129fi
131AC_SUBST(INSTALL_LIBRXVT) 130AC_SUBST(INSTALL_LIBRXVT)
132 131
133AC_ARG_ENABLE(everything, 132AC_ARG_ENABLE(everything,
134 [ --enable-everything enable standard non-multichoice features 133 [ --enable-everything enable standard non-multichoice features
135 NOTE: this option is order dependent 134 NOTE: this option is order dependent],
136 NOTE: automatically enabled with --enable-shared],
137 [ 135 [
138 if test x$enableval = xno; then 136 if test x$enableval = xno; then
139 support_frills=no 137 support_frills=no
140 support_inheritpixmap=no 138 support_inheritpixmap=no
141 support_fading=no 139 support_fading=no
… …
281 [ --enable-xterm-scroll enable Xterm style scrollbar], 279 [ --enable-xterm-scroll enable Xterm style scrollbar],
282 [if test x$enableval = xyes -o x$enableval = xno; then 280 [if test x$enableval = xyes -o x$enableval = xno; then
283 support_scroll_xterm=$enableval 281 support_scroll_xterm=$enableval
284 fi]) 282 fi])
285 283
284AC_ARG_ENABLE(plain-scroll,
285 [ --enable-plain-scroll enable plain style scrollbar],
286 [if test x$enableval = xyes -o x$enableval = xno; then
287 support_scroll_plain=$enableval
288 fi])
289
286AC_ARG_ENABLE(perl, 290AC_ARG_ENABLE(perl,
287 [ --enable-perl enable embedded perl interpreter], 291 [ --enable-perl enable embedded perl interpreter],
288 [if test x$enableval = xyes -o x$enableval = xno; then 292 [if test x$enableval = xyes -o x$enableval = xno; then
289 support_perl=$enableval 293 support_perl=$enableval
290 fi])
291
292AC_ARG_ENABLE(plain-scroll,
293 [ --enable-plain-scroll enable plain style scrollbar],
294 [if test x$enableval = xyes -o x$enableval = xno; then
295 support_scroll_plain=$enableval
296 fi]) 294 fi])
297 295
298AC_ARG_WITH(codesets, 296AC_ARG_WITH(codesets,
299 [ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)], 297 [ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
300 [codesets="$withval"]) 298 [codesets="$withval"])
… …
435 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" 433 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
436 fi]) 434 fi])
437 435
438dnl# -------------------------------------------------------------------------- 436dnl# --------------------------------------------------------------------------
439 437
438LIBEV_M4_AVOID_LIBRT=1
440m4_include([libev/libev.m4]) 439m4_include([libev/libev.m4])
441 440
442dnl# -------------------------------------------------------------------------- 441dnl# --------------------------------------------------------------------------
443 442
444AC_PATH_PROG(TIC, tic, :) 443AC_PATH_PROG(TIC, tic, :)
445
446dnl# need a neat way to detect SVR4 or its features
447dnl# in src/command.c we use these functions:
448dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
449dnl# - but are these also defined for other systems?
450
451dnl# hack to find if this is SVR4 -- who knows?
452dnl## AC_MSG_CHECKING(for SVR4)
453dnl## AC_EGREP_CPP(yes,
454dnl## [#if defined (SVR4) || defined (_SVR4) || defined (__svr4__)
455dnl## yes;
456dnl## #endif
457dnl## ], [AC_MSG_RESULT(yes); AC_DEFINE(PERHAPS_SVR4)], AC_MSG_RESULT(perhaps not?))
458 444
459AC_PATH_XTRA 445AC_PATH_XTRA
460 446
461AFTERIMAGE_CFLAGS= 447AFTERIMAGE_CFLAGS=
462AFTERIMAGE_LIBS= 448AFTERIMAGE_LIBS=
… …
494fi 480fi
495 481
496dnl# -------------------------------------------------------------------------- 482dnl# --------------------------------------------------------------------------
497dnl# CHECKING FOR HEADER FILES 483dnl# CHECKING FOR HEADER FILES
498dnl# -------------------------------------------------------------------------- 484dnl# --------------------------------------------------------------------------
499AC_HEADER_SYS_WAIT
500AC_CHECK_HEADERS( \ 485AC_CHECK_HEADERS( \
501 assert.h \ 486 assert.h \
502 fcntl.h \ 487 fcntl.h \
503 stdarg.h \ 488 stdarg.h \
504 stdlib.h \ 489 stdlib.h \
… …
515 wchar.h \ 500 wchar.h \
516 cwchar \ 501 cwchar \
517 clocale \ 502 clocale \
518) 503)
519 504
520AC_HEADER_TIME
521
522dnl# check to allow both <termios.h> and <sys/ioctl.h> 505dnl# check to allow both <termios.h> and <sys/ioctl.h>
523AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl, 506AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
524[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> 507[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
525#include <sys/ioctl.h> 508#include <sys/ioctl.h>
526#ifdef HAVE_TERMIOS_H 509#ifdef HAVE_TERMIOS_H
… …
545 [rxvt_xlib_illegal_access=yes],[rxvt_xlib_illegal_access=no] 528 [rxvt_xlib_illegal_access=yes],[rxvt_xlib_illegal_access=no]
546)]) 529)])
547if test x$rxvt_xlib_illegal_access = xyes; then 530if test x$rxvt_xlib_illegal_access = xyes; then
548 AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it) 531 AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it)
549fi 532fi
550
551AC_C_CONST
552AC_C_INLINE
553
554dnl> AC_HEADER_STDC dnl# skip this test, Sun always fails anyhow.
555 533
556dnl# -------------------------------------------------------------------------- 534dnl# --------------------------------------------------------------------------
557dnl# CHECKING FOR MISSING TYPEDEFS 535dnl# CHECKING FOR MISSING TYPEDEFS
558dnl# -------------------------------------------------------------------------- 536dnl# --------------------------------------------------------------------------
559dnl# Missing typedefs and replacements 537dnl# Missing typedefs and replacements
… …
643AC_SUBST(rxvt_u_intp_define) 621AC_SUBST(rxvt_u_intp_define)
644 622
645dnl# -------------------------------------------------------------------------- 623dnl# --------------------------------------------------------------------------
646dnl# CHECKING FOR LIBRARY FUNCTIONS 624dnl# CHECKING FOR LIBRARY FUNCTIONS
647dnl# -------------------------------------------------------------------------- 625dnl# --------------------------------------------------------------------------
648AC_TYPE_SIGNAL
649dnl> AC_FUNC_VPRINTF
650
651AC_CHECK_FUNCS(unsetenv) 626AC_CHECK_FUNCS(unsetenv)
652 627
653UTMP_CHECK 628UTMP_CHECK
654 629
655dnl# -------------------------------------------------------------------------- 630dnl# --------------------------------------------------------------------------
… …
725dnl# now add and remove other stuff 700dnl# now add and remove other stuff
726dnl# -------------------------------------------------------------------------- 701dnl# --------------------------------------------------------------------------
727if test x$support_xft = xyes; then 702if test x$support_xft = xyes; then
728 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 703 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
729 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 704 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
730 LIBS="$LIBS `$PKG_CONFIG xft --libs`" 705 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
731 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 706 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
732 else 707 else
733 AC_PATH_PROG(XFT_CONFIG, xft-config, no) 708 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
734 if test $XFT_CONFIG != no; then 709 if test $XFT_CONFIG != no; then
735 LIBS="$LIBS `$XFT_CONFIG --libs`" 710 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
736 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 711 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
737 fi 712 fi
738 fi 713 fi
739 714
715 save_LIBS="$LIBS"
716 LIBS="$LIBS $X_LIBS"
740 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 717 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
741 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no]) 718 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
719 LIBS="$save_LIBS"
742 720
743 if test x$support_xft = xyes; then 721 if test x$support_xft = xyes; then
744 AC_DEFINE(XFT, 1, Define to enable xft support) 722 AC_DEFINE(XFT, 1, Define to enable xft support)
745 fi 723 fi
746fi 724fi

Diff Legend

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