[Fontconfig] fontconfig: Branch 'master' - 2 commits

[Akira TAGOH]

 configure.ac    |   19 +++++++++++++++++--
 src/Makefile.am |    4 ++--
 2 files changed, 19 insertions(+), 4 deletions(-)

New commits:
commit 07bd14c5c7fed103020dc9b630d6a254861ada07
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Mar 9 11:55:43 2018 +0900

    Fix the build issue again on MinGW with enabling nls

diff --git a/src/Makefile.am b/src/Makefile.am
index 1ff065b..2111ce0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -82,7 +82,7 @@ AM_CPPFLAGS = 						\
 	-DFC_CACHEDIR='"$(FC_CACHEDIR)"'                \
 	-DFONTCONFIG_PATH='"$(BASECONFIGDIR)"'		\
 	-DFC_TEMPLATEDIR='"$(TEMPLATEDIR)"'
-LDADD  = $(INTLLIBS)
+LDADD  = $(LIBINTL)
 
 EXTRA_DIST += makealias
 
@@ -168,7 +168,7 @@ lib_LTLIBRARIES = libfontconfig.la
 libfontconfig_la_LDFLAGS =			\
 	-version-info @LIBT_VERSION_INFO@ -no-undefined $(export_symbols)
 
-libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) $(UUID_LIBS) $(INTLLIBS)
+libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) $(UUID_LIBS) $(LTLIBINTL)
 
 libfontconfig_la_DEPENDENCIES = $(fontconfig_def_dependency)
 
commit bb50f62b58b5057f80f3775f91fa94b225fc6672
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Mar 8 18:19:32 2018 +0900

    Use the builtin uuid for OSX
    
    https://bugs.freedesktop.org/show_bug.cgi?id=105366

diff --git a/configure.ac b/configure.ac
index 85f113f..e600b2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -336,8 +336,23 @@ CFLAGS="$fontconfig_save_cflags"
 # Check for uuid
 #
 if test "$os_win32" != "yes"; then
-	PKG_CHECK_MODULES([UUID], [uuid])
-	PKGCONFIG_REQUIRES_PRIVATELY="$PKGCONFIG_REQUIRES_PRIVATELY uuid"
+	use_pkgconfig_for_uuid=yes
+	PKG_CHECK_MODULES([UUID], [uuid],
+			  [use_pkgconfig_for_uuid=yes],
+			  [use_pkgconfig_for_uuid=no])
+	if test "x$use_pkgconfig_for_uuid" = "xno"; then
+		AC_MSG_CHECKING([where uuid functions comes from])
+		AC_TRY_LINK([#include <uuid/uuid.h>],
+			[uuid_t a; uuid_generate(a);],
+			[AC_MSG_RESULT([builtin])
+			 UUID_CFLAGS=""
+			 UUID_LIBS=""
+			],[AC_MSG_ERROR([
+*** uuid is required. install util-linux.
+			])])
+	else
+		PKGCONFIG_REQUIRES_PRIVATELY="$PKGCONFIG_REQUIRES_PRIVATELY uuid"
+	fi
 else
 	UUID_CFLAGS=""
 	UUID_LIBS=""