fontconfig: Branch 'master'

 configure.ac |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

New commits:
commit 5cfd594c71345bcb91a56100fc3bbfef15253a95
Author: Akira TAGOH <[email protected]>
Date:   Tue Jan 2 19:04:45 2018 +0900

    do not check the existence of itstool on win32

diff --git a/configure.ac b/configure.ac
index b0fc537..6fe78e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,6 +90,16 @@ PKGCONFIG_REQUIRES=
 PKGCONFIG_REQUIRES_PRIVATELY=
 
 dnl ==========================================================================
+case "$host" in
+  *-*-mingw*)
+    os_win32=yes
+    ;;
+  *)
+    os_win32=no
+esac
+AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
+
+dnl ==========================================================================
 dnl gettext stuff
 dnl ==========================================================================
 GETTEXT_PACKAGE=$PACKAGE
@@ -99,22 +109,15 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
 AM_GNU_GETTEXT_VERSION([0.19.8])
 AM_GNU_GETTEXT([external])
 
+if test "$os_win32" = "no"; then
 AC_PATH_PROG(ITSTOOL, [itstool])
 if test -z "$ITSTOOL"; then
    AC_MSG_ERROR([The itstool were not found. Please install itstool.])
 fi
+fi
 
 dnl ==========================================================================
 
-case "$host" in
-  *-*-mingw*)
-    os_win32=yes
-    ;;
-  *)
-    os_win32=no
-esac
-AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
-
 if test "$os_win32" = "yes"; then
   AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
 fi
_______________________________________________
Fontconfig mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/fontconfig