diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-19 13:23:24 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-19 13:23:24 +0200 |
| commit | b2c925e360e2c366526de15b44603f855f94139c (patch) | |
| tree | 2a963073645913b7c6d43fa04dc0aa13bda57b80 /libXft/configure.ac | |
| parent | 18ae1470a8dbcfe369ddf0d7e17e0ea665251ccd (diff) | |
| download | vcxsrv-b2c925e360e2c366526de15b44603f855f94139c.tar.gz vcxsrv-b2c925e360e2c366526de15b44603f855f94139c.tar.bz2 vcxsrv-b2c925e360e2c366526de15b44603f855f94139c.zip | |
xtrans libX11 libXext libXdmcp libXau libXft libXinerama libXmu libfontenc
mesa git update 19 sept 2011
Diffstat (limited to 'libXft/configure.ac')
| -rw-r--r-- | libXft/configure.ac | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libXft/configure.ac b/libXft/configure.ac index 9b9f6a74d..54d960fa0 100644 --- a/libXft/configure.ac +++ b/libXft/configure.ac @@ -64,11 +64,11 @@ AC_SUBST([XFT_LT_VERSION]) # # Check for Xrender # -PKG_CHECK_MODULES(XRENDER, xrender >= 0.8.2, [xrender_found_with_pkgconfig=yes], +PKG_CHECK_MODULES(XRENDER, xrender >= 0.8.2, [xrender_found_with_pkgconfig=yes], [xrender_found_with_pkgconfig=no]) case "$xrender_found_with_pkgconfig" in no) - PKG_CHECK_MODULES(XRENDER, xrender >= 0, [old_xrender_found_with_pkgconfig=yes], + PKG_CHECK_MODULES(XRENDER, xrender >= 0, [old_xrender_found_with_pkgconfig=yes], [old_xrender_found_with_pkgconfig=no]) case "$old_xrender_found_with_pkgconfig" in yes) @@ -97,13 +97,13 @@ esac # Check freetype configuration AC_ARG_WITH(freetype-config, [ --with-freetype-config=PROG Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=auto) - + if test "$freetype_config" = "auto"; then - PKG_CHECK_MODULES(FREETYPE, freetype2, + PKG_CHECK_MODULES(FREETYPE, freetype2, freetype_config=no, freetype_config=yes) fi -if test "$freetype_config" = "yes"; then +if test "$freetype_config" = "yes"; then AC_PATH_PROG(ft_config,freetype-config,no) if test "$ft_config" = "no"; then AC_MSG_ERROR([You must have freetype installed; see http://www.freetype.org/]) @@ -112,7 +112,7 @@ else ft_config="$freetype_config" fi -if test "$freetype_config" != "no"; then +if test "$freetype_config" != "no"; then FREETYPE_CFLAGS="`$ft_config --cflags`" FREETYPE_LIBS="`$ft_config --libs`" fi |