fontconfig: Branch 'master'

[email protected] (Akira TAGOH)
Newsgroups gmane.comp.fonts.fontconfig
Message-ID <[email protected]>
 configure.ac |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit af687139f2866a736f294c7c54f9ea57219a079b
Author: Akira TAGOH <[email protected]>
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=""
_______________________________________________
Fontconfig mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/fontconfig
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.