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.86 by ayin, Tue Dec 4 01:20: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"
… …
62dnl# -------------------------------------------------------------------------- 63dnl# --------------------------------------------------------------------------
63dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' 64dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
64dnl# 65dnl#
65if test -z "$orig_CXXFLAGS"; then 66if test -z "$orig_CXXFLAGS"; then
66 if test x$GCC = xyes && test "x$GXX" = xyes; then 67 if test x$GCC = xyes && test "x$GXX" = xyes; then
67 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"
68 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"]) 69 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"])
69 else 70 else
70 CXXFLAGS="-O" 71 CXXFLAGS="-O"
71 fi 72 fi
72 CFLAGS="$CXXFLAGS" 73 CFLAGS="$CXXFLAGS"
… …
281 [ --enable-xterm-scroll enable Xterm style scrollbar], 282 [ --enable-xterm-scroll enable Xterm style scrollbar],
282 [if test x$enableval = xyes -o x$enableval = xno; then 283 [if test x$enableval = xyes -o x$enableval = xno; then
283 support_scroll_xterm=$enableval 284 support_scroll_xterm=$enableval
284 fi]) 285 fi])
285 286
287AC_ARG_ENABLE(plain-scroll,
288 [ --enable-plain-scroll enable plain style scrollbar],
289 [if test x$enableval = xyes -o x$enableval = xno; then
290 support_scroll_plain=$enableval
291 fi])
292
286AC_ARG_ENABLE(perl, 293AC_ARG_ENABLE(perl,
287 [ --enable-perl enable embedded perl interpreter], 294 [ --enable-perl enable embedded perl interpreter],
288 [if test x$enableval = xyes -o x$enableval = xno; then 295 [if test x$enableval = xyes -o x$enableval = xno; then
289 support_perl=$enableval 296 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]) 297 fi])
297 298
298AC_ARG_WITH(codesets, 299AC_ARG_WITH(codesets,
299 [ --with-codesets=CS,... 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)],
300 [codesets="$withval"]) 301 [codesets="$withval"])
… …
435 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"
436 fi]) 437 fi])
437 438
438dnl# -------------------------------------------------------------------------- 439dnl# --------------------------------------------------------------------------
439 440
441LIBEV_M4_AVOID_LIBRT=1
440m4_include([libev/libev.m4]) 442m4_include([libev/libev.m4])
441 443
442dnl# -------------------------------------------------------------------------- 444dnl# --------------------------------------------------------------------------
443 445
444AC_PATH_PROG(TIC, tic, :) 446AC_PATH_PROG(TIC, tic, :)
… …
725dnl# now add and remove other stuff 727dnl# now add and remove other stuff
726dnl# -------------------------------------------------------------------------- 728dnl# --------------------------------------------------------------------------
727if test x$support_xft = xyes; then 729if test x$support_xft = xyes; then
728 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 730 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
729 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 731 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
730 LIBS="$LIBS `$PKG_CONFIG xft --libs`" 732 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
731 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 733 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
732 else 734 else
733 AC_PATH_PROG(XFT_CONFIG, xft-config, no) 735 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
734 if test $XFT_CONFIG != no; then 736 if test $XFT_CONFIG != no; then
735 LIBS="$LIBS `$XFT_CONFIG --libs`" 737 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
736 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 738 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
737 fi 739 fi
738 fi 740 fi
739 741
742 save_LIBS="$LIBS"
743 LIBS="$LIBS $X_LIBS"
740 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 744 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
741 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no]) 745 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
746 LIBS="$save_LIBS"
742 747
743 if test x$support_xft = xyes; then 748 if test x$support_xft = xyes; then
744 AC_DEFINE(XFT, 1, Define to enable xft support) 749 AC_DEFINE(XFT, 1, Define to enable xft support)
745 fi 750 fi
746fi 751fi

Diff Legend

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