Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-17 18:45:10 +00:00
Code Issues Releases Activity

Use pkg-config instead of xft-config for detecting Xft. This should fix xft

Browse Source 
support on modern distros like FC 5. However, it works with the old ones as
well.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@701 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Roman Bogorodskiy 2006-09-27 18:27:27 +00:00
parent f9d4d7c2e8
commit fb79796829
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
configure.ac
View File

@ -3,7 +3,7 @@ AC_INIT([Conky],[1.4.2],[brenden1@users.sourceforge.net])
AM_INIT_AUTOMAKE(conky, 1.4.2) AM_INIT_AUTOMAKE(conky, 1.4.2)
AM_CONFIG_HEADER(src/config.h) AM_CONFIG_HEADER(src/config.h)
dnl dnl
dnl C Compiler nl C Compiler
dnl dnl
AC_PROG_CC AC_PROG_CC
@ -459,22 +459,13 @@ dnl Xft
dnl dnl
if test x$want_xft && test x$want_x11; then if test x$want_xft && test x$want_x11; then
AC_PATH_PROG(XFTCONFIG, xft-config) PKG_CHECK_MODULES(XFT, [xft],
if test x$XFTCONFIG != x; then [
dnl TODO: needs more checks
dnl This won't work for some reason
dnl AC_CHECK_HEADERS([X11/Xft/Xft.h], [], [XFT_MISSING=yes])
if test "x$XFT_MISSING" = xyes; then
AC_MSG_ERROR([something went wrong when checking for Xft, you're probably missing headers or it's not installed])
fi
AC_DEFINE(XFT, 1, [Define if you are using Xft]) AC_DEFINE(XFT, 1, [Define if you are using Xft])
CFLAGS="$CFLAGS `$XFTCONFIG --cflags`" CFLAGS="$CFLAGS $XFT_CFLAGS"
XFT_LIBS=`$XFTCONFIG --libs` AC_SUBST(XFT_LIBS)
else ],
want_xft=no [want_xft=no])
fi
fi fi
dnl dnl
@ -609,7 +600,6 @@ CFLAGS="$CFLAGS -Wall -W"
AC_SUBST(CFLAGS) AC_SUBST(CFLAGS)
AC_SUBST(X11_LIBS) AC_SUBST(X11_LIBS)
AC_SUBST(XFT_LIBS)
AC_OUTPUT AC_OUTPUT