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.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"
… …
725dnl# now add and remove other stuff 726dnl# now add and remove other stuff
726dnl# -------------------------------------------------------------------------- 727dnl# --------------------------------------------------------------------------
727if test x$support_xft = xyes; then 728if test x$support_xft = xyes; then
728 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 729 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
729 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 730 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
730 LIBS="$LIBS `$PKG_CONFIG xft --libs`" 731 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
731 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 732 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
732 else 733 else
733 AC_PATH_PROG(XFT_CONFIG, xft-config, no) 734 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
734 if test $XFT_CONFIG != no; then 735 if test $XFT_CONFIG != no; then
735 LIBS="$LIBS `$XFT_CONFIG --libs`" 736 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
736 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 737 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
737 fi 738 fi
738 fi 739 fi
739 740
741 save_LIBS="$LIBS"
742 LIBS="$LIBS $X_LIBS"
740 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 743 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
741 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no]) 744 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
745 LIBS="$save_LIBS"
742 746
743 if test x$support_xft = xyes; then 747 if test x$support_xft = xyes; then
744 AC_DEFINE(XFT, 1, Define to enable xft support) 748 AC_DEFINE(XFT, 1, Define to enable xft support)
745 fi 749 fi
746fi 750fi

Diff Legend

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