[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 configure.ac          |    3 ++-
 fc-blanks/Makefile.am |    5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit c88d9b62421e8ba35a71319c7b0d555d512510c7
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Aug 17 16:37:08 2015 +0900

    Fail on make runtime as needed instead of configure if no python installed
    
    python isn't necessarily required to build fontconfig from tarball so that
    generated fcblanks.h is available in tarball.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=91663

diff --git a/configure.ac b/configure.ac
index 0ab3cfc..5c10dd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,8 @@ m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], AC_SUBST([pkgconfigdir], ${libdir}/
 
 AM_MISSING_PROG([GIT], [git])
 AM_MISSING_PROG([GPERF], [gperf])
-AM_PATH_PYTHON
+AM_PATH_PYTHON(,, [:])
+AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
 
 AC_MSG_CHECKING([for RM macro])
 _predefined_rm=`make -p -f /dev/null 2>/dev/null|grep '^RM ='|sed -e 's/^RM = //'`
diff --git a/fc-blanks/Makefile.am b/fc-blanks/Makefile.am
index e9de1fe..2b2075f 100644
--- a/fc-blanks/Makefile.am
+++ b/fc-blanks/Makefile.am
@@ -28,8 +28,13 @@ noinst_SCRIPTS = $(BLANKSPY)
 noinst_HEADERS = $(BLANKS_H)
 
 $(BLANKS_H): $(TMPL) $(BLANKSPY)
+if HAVE_PYTHON
 	$(AM_V_GEN) $(PYTHON) $(srcdir)/$(BLANKSPY) < $< > $(BLANKS_H).tmp && \
 	mv $(BLANKS_H).tmp $(BLANKS_H) || ($(RM) $(BLANKS_H).tmp && false)
+else
+	@echo "No python installed. please install python to build $(BLANKS_H)."
+	@false
+endif
 
 EXTRA_DIST = 		\
 	$(BLANKSPY)	\