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

Diff Legend

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