[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 configure.ac |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit af687139f2866a736f294c7c54f9ea57219a079b
Author: Akira TAGOH <akira at tagoh.org>
Date:   Sat Mar 10 20:47:54 2018 +0900

    Add uuid to Requires.private in .pc only when pkgconfig macro found it

diff --git a/configure.ac b/configure.ac
index e600b2d..557d151 100644
--- a/configure.ac
+++ b/configure.ac
@@ -337,6 +337,9 @@ CFLAGS="$fontconfig_save_cflags"
 #
 if test "$os_win32" != "yes"; then
 	use_pkgconfig_for_uuid=yes
+	if test -n "${UUID_LIBS}"; then
+		save_UUID_LIBS=$UUID_LIBS
+	fi
 	PKG_CHECK_MODULES([UUID], [uuid],
 			  [use_pkgconfig_for_uuid=yes],
 			  [use_pkgconfig_for_uuid=no])
@@ -351,7 +354,9 @@ if test "$os_win32" != "yes"; then
 *** uuid is required. install util-linux.
 			])])
 	else
-		PKGCONFIG_REQUIRES_PRIVATELY="$PKGCONFIG_REQUIRES_PRIVATELY uuid"
+		if test -z "${save_UUID_LIBS+x}" && test "x${UUID_LIBS}" != "x"; then
+			PKGCONFIG_REQUIRES_PRIVATELY="$PKGCONFIG_REQUIRES_PRIVATELY uuid"
+		fi
 	fi
 else
 	UUID_CFLAGS=""