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.79 by ayin, Wed Oct 31 11:59:09 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"
… …
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"
… …
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
442m4_include([libev/libev.m4])
443
444dnl# --------------------------------------------------------------------------
445
440AC_PATH_PROG(TIC, tic, :) 446AC_PATH_PROG(TIC, tic, :)
441 447
442dnl# need a neat way to detect SVR4 or its features 448dnl# need a neat way to detect SVR4 or its features
443dnl# in src/command.c we use these functions: 449dnl# in src/command.c we use these functions:
444dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h> 450dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
… …
642dnl# CHECKING FOR LIBRARY FUNCTIONS 648dnl# CHECKING FOR LIBRARY FUNCTIONS
643dnl# -------------------------------------------------------------------------- 649dnl# --------------------------------------------------------------------------
644AC_TYPE_SIGNAL 650AC_TYPE_SIGNAL
645dnl> AC_FUNC_VPRINTF 651dnl> AC_FUNC_VPRINTF
646 652
647AC_CHECK_FUNCS( \ 653AC_CHECK_FUNCS(unsetenv)
648 unsetenv \
649 setutent \
650 on_exit \
651)
652 654
653UTMP_CHECK 655UTMP_CHECK
654 656
655dnl# -------------------------------------------------------------------------- 657dnl# --------------------------------------------------------------------------
656
657dnl# find ttys/ttytab
658AC_CACHE_CHECK(where ttys/ttytab is located, rxvt_cv_path_ttytab,
659[for ttys_file in dnl
660 /etc/ttys /etc/ttytab;
661do
662 if test -f "$ttys_file" ; then
663 rxvt_cv_path_ttytab=$ttys_file
664 break
665 fi
666done
667])
668if test x$rxvt_cv_path_ttytab != x; then
669 AC_DEFINE_UNQUOTED(TTYTAB_FILENAME, "$rxvt_cv_path_ttytab", Define location of ttys/ttytab)
670fi
671 658
672dnl# -------------------------------------------------------------------------- 659dnl# --------------------------------------------------------------------------
673dnl# -------------------------------------------------------------------------- 660dnl# --------------------------------------------------------------------------
674 661
675dnl# this is a really hack test for some basic Xlocale stuff 662dnl# this is a really hack test for some basic Xlocale stuff
… …
740dnl# now add and remove other stuff 727dnl# now add and remove other stuff
741dnl# -------------------------------------------------------------------------- 728dnl# --------------------------------------------------------------------------
742if test x$support_xft = xyes; then 729if test x$support_xft = xyes; then
743 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 730 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
744 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 731 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
745 LIBS="$LIBS `$PKG_CONFIG xft --libs`" 732 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
746 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 733 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
747 else 734 else
748 AC_PATH_PROG(XFT_CONFIG, xft-config, no) 735 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
749 if test $XFT_CONFIG != no; then 736 if test $XFT_CONFIG != no; then
750 LIBS="$LIBS `$XFT_CONFIG --libs`" 737 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
751 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 738 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
752 fi 739 fi
753 fi 740 fi
754 741
742 save_LIBS="$LIBS"
743 LIBS="$LIBS $X_LIBS"
755 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 744 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
756 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no]) 745 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
746 LIBS="$save_LIBS"
757 747
758 if test x$support_xft = xyes; then 748 if test x$support_xft = xyes; then
759 AC_DEFINE(XFT, 1, Define to enable xft support) 749 AC_DEFINE(XFT, 1, Define to enable xft support)
760 fi 750 fi
761fi 751fi

Diff Legend

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