diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-12 08:25:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-12 08:25:37 +0200 |
| commit | 66b46719d55e60d53b42858770d6ac40d079ab13 (patch) | |
| tree | aad06d011ed8b820685f72ada34e56ee0f2580c6 /fontconfig | |
| parent | f8f0209a691e0d0838d1ef9d602ebacafee2a233 (diff) | |
| parent | ffce4319c2fb6f4f663cc5a9660e1d5837fcde87 (diff) | |
| download | vcxsrv-66b46719d55e60d53b42858770d6ac40d079ab13.tar.gz vcxsrv-66b46719d55e60d53b42858770d6ac40d079ab13.tar.bz2 vcxsrv-66b46719d55e60d53b42858770d6ac40d079ab13.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans fontconfig mesa xserver git update 12 Jul 2013
Diffstat (limited to 'fontconfig')
| -rw-r--r-- | fontconfig/configure.ac | 20 | ||||
| -rw-r--r-- | fontconfig/fontconfig.pc.in | 6 |
2 files changed, 21 insertions, 5 deletions
diff --git a/fontconfig/configure.ac b/fontconfig/configure.ac index aeb151331..321feced4 100644 --- a/fontconfig/configure.ac +++ b/fontconfig/configure.ac @@ -54,6 +54,9 @@ AC_SUBST(LIBT_VERSION_INFO) LIBT_CURRENT_MINUS_AGE=`expr $LIBT_CURRENT - $LIBT_AGE` AC_SUBST(LIBT_CURRENT_MINUS_AGE) +PKGCONFIG_REQUIRES= +PKGCONFIG_REQUIRES_PRIVATELY= + dnl ========================================================================== AC_CONFIG_HEADERS(config.h) @@ -282,13 +285,14 @@ if test "x$enable_iconv" != "xno"; then AC_TRY_LINK([#include <iconv.h>], [iconv_open ("from", "to");], [iconv_type="libiconv" - use_iconv=1], + use_iconv=1 + ICONV_CFLAGS="$libiconv_cflags" + ICONV_LIBS="$libiconv_libs" + ], [use_iconv=0]) CFLAGS="$iconvsaved_CFLAGS" LIBS="$iconvsaved_LIBS" - ICONV_CFLAGS="$libiconv_cflags" - ICONV_LIBS="$libiconv_libs" fi if test "x$use_iconv" = "x0"; then AC_TRY_LINK([#include <iconv.h>], @@ -308,6 +312,7 @@ AC_DEFINE_UNQUOTED(USE_ICONV,$use_iconv,[Use iconv.]) # Checks for FreeType # PKG_CHECK_MODULES(FREETYPE, freetype2) +PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES freetype2" AC_SUBST(FREETYPE_LIBS) AC_SUBST(FREETYPE_CFLAGS) @@ -367,6 +372,8 @@ if test "$enable_libxml2" != "yes"; then else EXPAT_LIBS="-lexpat" fi + else + PKGCONFIG_REQUIRES_PRIVATELY="$PKGCONFIG_REQUIRES_PRIVATELY expat" fi expatsaved_CPPFLAGS="$CPPFLAGS" @@ -408,6 +415,7 @@ AC_ARG_ENABLE(libxml2, if test "$enable_libxml2" = "yes"; then PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6]) + PKGCONFIG_REQUIRES_PRIVATELY="$PKGCONFIG_REQUIRES_PRIVATELY libxml-2.0" AC_DEFINE_UNQUOTED(ENABLE_LIBXML2,1,[Use libxml2 instead of Expat]) AC_SUBST(LIBXML2_CFLAGS) @@ -715,6 +723,12 @@ dnl include the header file for workaround of miscalculating size on autoconf dnl particularly for fat binaries AH_BOTTOM([#include "config-fixups.h"]) +dnl +dnl +AC_SUBST(PKGCONFIG_REQUIRES) +AC_SUBST(PKGCONFIG_REQUIRES_PRIVATELY) + +dnl AC_CONFIG_FILES([ Makefile fontconfig/Makefile diff --git a/fontconfig/fontconfig.pc.in b/fontconfig/fontconfig.pc.in index 9ef2c273f..6e112bb49 100644 --- a/fontconfig/fontconfig.pc.in +++ b/fontconfig/fontconfig.pc.in @@ -11,6 +11,8 @@ cachedir=@fc_cachedir@ Name: Fontconfig Description: Font configuration and customization library Version: @VERSION@ +Requires: @PKGCONFIG_REQUIRES@ +Requires.private: @PKGCONFIG_REQUIRES_PRIVATELY@ Libs: -L${libdir} -lfontconfig -Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@ -Cflags: -I${includedir} +Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@ @LIBXML2_LIBS@ +Cflags: -I${includedir} @EXPAT_CFLAGS@ @FREETYPE_CFLAGS@ @ICONV_CFLAGS@ @LIBXML2_CFLAGS@ |