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.80 by ayin, Mon Nov 5 00:19:14 2007 UTC vs.
Revision 1.84 by root, Sun Nov 18 01:31:38 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"
… …
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>
… …
648 654
649UTMP_CHECK 655UTMP_CHECK
650 656
651dnl# -------------------------------------------------------------------------- 657dnl# --------------------------------------------------------------------------
652 658
653dnl# find ttys/ttytab
654AC_CACHE_CHECK(where ttys/ttytab is located, rxvt_cv_path_ttytab,
655[for ttys_file in dnl
656 /etc/ttys /etc/ttytab;
657do
658 if test -f "$ttys_file" ; then
659 rxvt_cv_path_ttytab=$ttys_file
660 break
661 fi
662done
663])
664if test x$rxvt_cv_path_ttytab != x; then
665 AC_DEFINE_UNQUOTED(TTYTAB_FILENAME, "$rxvt_cv_path_ttytab", Define location of ttys/ttytab)
666fi
667
668dnl# -------------------------------------------------------------------------- 659dnl# --------------------------------------------------------------------------
669dnl# -------------------------------------------------------------------------- 660dnl# --------------------------------------------------------------------------
670 661
671dnl# this is a really hack test for some basic Xlocale stuff 662dnl# this is a really hack test for some basic Xlocale stuff
672save_LIBS=$LIBS 663save_LIBS=$LIBS
… …
736dnl# now add and remove other stuff 727dnl# now add and remove other stuff
737dnl# -------------------------------------------------------------------------- 728dnl# --------------------------------------------------------------------------
738if test x$support_xft = xyes; then 729if test x$support_xft = xyes; then
739 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 730 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
740 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 731 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
741 LIBS="$LIBS `$PKG_CONFIG xft --libs`" 732 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
742 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 733 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
743 else 734 else
744 AC_PATH_PROG(XFT_CONFIG, xft-config, no) 735 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
745 if test $XFT_CONFIG != no; then 736 if test $XFT_CONFIG != no; then
746 LIBS="$LIBS `$XFT_CONFIG --libs`" 737 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
747 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 738 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
748 fi 739 fi
749 fi 740 fi
750 741
742 save_LIBS="$LIBS"
743 LIBS="$LIBS $X_LIBS"
751 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 744 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
752 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no]) 745 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
746 LIBS="$save_LIBS"
753 747
754 if test x$support_xft = xyes; then 748 if test x$support_xft = xyes; then
755 AC_DEFINE(XFT, 1, Define to enable xft support) 749 AC_DEFINE(XFT, 1, Define to enable xft support)
756 fi 750 fi
757fi 751fi

Diff Legend

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