[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 configure.ac     |   26 +++++++++++++++++++++++---
 fontconfig.pc.in |    7 ++++---
 2 files changed, 27 insertions(+), 6 deletions(-)

New commits:
commit 7274f6e37a4d1a062b4eee3a625bd393a283a9d0
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Jul 12 12:39:36 2013 +0900

    Correct fontconfig.pc to add certain dependencies for build

diff --git a/configure.ac b/configure.ac
index aeb1513..7cf01fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,10 @@ AC_SUBST(LIBT_VERSION_INFO)
 LIBT_CURRENT_MINUS_AGE=`expr $LIBT_CURRENT - $LIBT_AGE`
 AC_SUBST(LIBT_CURRENT_MINUS_AGE)
 
+PKGCONFIG_REQUIRES=
+PKGCONFIG_CFLAGS=
+PKGCONFIG_LIBS=
+
 dnl ==========================================================================
 
 AC_CONFIG_HEADERS(config.h)
@@ -282,13 +286,16 @@ 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"
+			 PKGCONFIG_CFLAGS="$PKGCONFIG_CFLAGS $ICONV_CFLAGS"
+			 PKGCONFIG_LIBS="$PKGCONFIG_LIBS $ICONV_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 +315,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 +375,10 @@ if test "$enable_libxml2" != "yes"; then
 		else
 			EXPAT_LIBS="-lexpat"
 		fi
+		PKGCONFIG_CFLAGS="$PKGCONFIG_CFLAGS $EXPAT_CFLAGS"
+		PKGCONFIG_LIBS="$PKGCONFIG_LIBS $EXPAT_LIBS"
+	else
+		PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES expat"
 	fi
 
 	expatsaved_CPPFLAGS="$CPPFLAGS"
@@ -408,6 +420,7 @@ AC_ARG_ENABLE(libxml2,
 
 if test "$enable_libxml2" = "yes"; then
     PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6])
+    PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES libxml-2.0"
     AC_DEFINE_UNQUOTED(ENABLE_LIBXML2,1,[Use libxml2 instead of Expat])
 
     AC_SUBST(LIBXML2_CFLAGS)
@@ -715,6 +728,13 @@ 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_CFLAGS)
+AC_SUBST(PKGCONFIG_LIBS)
+
+dnl
 AC_CONFIG_FILES([
 Makefile
 fontconfig/Makefile
diff --git a/fontconfig.pc.in b/fontconfig.pc.in
index 9ef2c27..3cc41e2 100644
--- a/fontconfig.pc.in
+++ b/fontconfig.pc.in
@@ -11,6 +11,7 @@ cachedir=@fc_cachedir@
 Name: Fontconfig
 Description: Font configuration and customization library
 Version: @VERSION@
-Libs: -L${libdir} -lfontconfig
-Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@
-Cflags: -I${includedir}
+Requires: @PKGCONFIG_REQUIRES@
+Libs: -L${libdir} -lfontconfig @PKGCONFIG_LIBS@
+Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@ @LIBXML2_LIBS@
+Cflags: -I${includedir} @PKGCONFIG_CFLAGS@