… | |
… | |
17 | changequote([, ])dnl |
17 | changequote([, ])dnl |
18 | AC_SUBST(VERSION)dnl |
18 | AC_SUBST(VERSION)dnl |
19 | AC_SUBST(DATE)dnl |
19 | AC_SUBST(DATE)dnl |
20 | AC_SUBST(LSMDATE)dnl |
20 | AC_SUBST(LSMDATE)dnl |
21 | AC_SUBST(LIBVERSION)dnl |
21 | AC_SUBST(LIBVERSION)dnl |
|
|
22 | |
22 | echo "" |
23 | echo "" |
23 | echo "configuring for rxvt $VERSION" |
24 | echo "configuring for rxvt $VERSION" |
24 | echo "" |
25 | echo "" |
25 | |
26 | |
26 | orig_CXXFLAGS="$CXXFLAGS" |
27 | orig_CXXFLAGS="$CXXFLAGS" |
… | |
… | |
725 | dnl# now add and remove other stuff |
726 | dnl# now add and remove other stuff |
726 | dnl# -------------------------------------------------------------------------- |
727 | dnl# -------------------------------------------------------------------------- |
727 | if test x$support_xft = xyes; then |
728 | if 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 |
746 | fi |
750 | fi |