comparison configure.in @ 75412:abe8808b987c

Add check for libXft.
author Jan Djärv <jan.h.d@swipnet.se>
date Fri, 26 Jan 2007 16:32:00 +0000
parents 3d45362f1d38
children 9f5312eef798
comparison
equal deleted inserted replaced
75411:1ea8b557af8b 75412:abe8808b987c
2148 [Define to 1 if you have GTK and pthread (-lpthread).]) 2148 [Define to 1 if you have GTK and pthread (-lpthread).])
2149 fi 2149 fi
2150 fi 2150 fi
2151 fi 2151 fi
2152 2152
2153 ### Link with -lXft if available to work around a bug.
2154 HAVE_XFT=maybe
2155 if test "${HAVE_GTK}" = "yes"; then
2156 dnl Check if --with-pkg-config-prog has been given.
2157 if test "X${with_pkg_config_prog}" != X; then
2158 PKG_CONFIG="${with_pkg_config_prog}"
2159 fi
2160
2161 PKG_CHECK_MODULES(XFT, xft >= 0.13.0, , HAVE_XFT=no)
2162 if test "$HAVE_XFT" != no; then
2163 OLD_CFLAGS="$CPPFLAGS"
2164 OLD_CFLAGS="$CFLAGS"
2165 OLD_LIBS="$LIBS"
2166 CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
2167 CFLAGS="$CFLAGS $XFT_CFLAGS"
2168 LIBS="$XFT_LIBS $LIBS"
2169 AC_CHECK_HEADER(X11/Xft/Xft.h,
2170 AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS))
2171
2172 if test "${HAVE_XFT}" = "yes"; then
2173 AC_DEFINE(HAVE_XFT, 1, [Define to 1 if you have the Xft library.])
2174 AC_SUBST(XFT_LIBS)
2175 C_SWITCH_X_SITE="$C_SWITCH_X_SITE $XFT_CFLAGS"
2176 else
2177 CFLAGS="$OLD_CPPFLAGS"
2178 CFLAGS="$OLD_CFLAGS"
2179 LIBS="$OLD_LIBS"
2180 fi
2181 fi
2182 fi
2183
2153 dnl Do not put whitespace before the #include statements below. 2184 dnl Do not put whitespace before the #include statements below.
2154 dnl Older compilers (eg sunos4 cc) choke on it. 2185 dnl Older compilers (eg sunos4 cc) choke on it.
2155 if test x"${USE_X_TOOLKIT}" = xmaybe; then 2186 if test x"${USE_X_TOOLKIT}" = xmaybe; then
2156 if test x"${HAVE_X11R5}" = xyes; then 2187 if test x"${HAVE_X11R5}" = xyes; then
2157 AC_MSG_CHECKING(X11 version 5 with Xaw) 2188 AC_MSG_CHECKING(X11 version 5 with Xaw)