applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

only #define HAVE_XFT2 if we actually have xft2

Browse source 
2002-07-24  jacob berkman  <jacob@ximian.com>

	* configure.in: only #define HAVE_XFT2 if we actually have xft2
This commit is contained in:
jacob berkman 2002-07-24 13:27:35 +00:00 • committed by Jacob Berkman
parent e8298aa225
commit c27d13b7de
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -1,5 +1,7 @@
2002-07-24 jacob berkman <jacob@ximian.com> 2002-07-24 jacob berkman <jacob@ximian.com>
* configure.in: only #define HAVE_XFT2 if we actually have xft2
* configure.in: fixup x11 checks when x11 include path is not in * configure.in: fixup x11 checks when x11 include path is not in
the default include path for the compiler the default include path for the compiler

7
configure.in
View file

@ -64,15 +64,12 @@ dnl
dnl Check for Xft version 2; we build in extra functionality to the font capplet dnl Check for Xft version 2; we build in extra functionality to the font capplet
dnl when we have it. dnl when we have it.
dnl dnl
have_xft2=false xft_modules=
xft_modules=""
if $PKG_CONFIG --exists xft ; then if $PKG_CONFIG --exists xft ; then
have_xft2=true
xft_modules="xft" xft_modules="xft"
AC_DEFINE(HAVE_XFT2)
fi fi
AC_DEFINE(HAVE_XFT2)
PKG_CHECK_MODULES(FONT_CAPPLET, $COMMON_MODULES $xft_modules) PKG_CHECK_MODULES(FONT_CAPPLET, $COMMON_MODULES $xft_modules)
CAPPLET_LIBS="$CAPPLET_LIBS $x_libs" CAPPLET_LIBS="$CAPPLET_LIBS $x_libs"