[Fontconfig] fontconfig: Branch 'master'

[Jon TURNEY]

On 27/11/2012 09:25, Akira TAGOH wrote:
>  configure.ac             |    1 
>  m4/ax_create_stdint_h.m4 |  695 +++++++++++++++++++++++++++++++++++++++++++++++
>  src/Makefile.am          |   11 
>  src/fcint.h              |    9 
>  4 files changed, 707 insertions(+), 9 deletions(-)
> 
> New commits:
> commit 3d3629f86a45d30eed51dad58865753b3b1e186e
> Author: Akira TAGOH <akira at tagoh.org>
> Date:   Tue Nov 27 18:25:11 2012 +0900
> 
>     Fix a potability issue about stdint.h

This doesn't compile when srcdir != builddir. See [1],

[1] http://tinderbox.freedesktop.org/builds/2012-11-27-0011/logs/fontconfig/#build

Something like the attached patch to add ${top_builddir)/src to the include
path so the generated header fcstdint.h can be found, is needed.

(Note that you also have to ./configure --disable-docs when building srcdir !=
builddir, there's some other problem with that I don't have a good fix for)

-------------- next part --------------
>From 665ff15bcb1f3f82e609888a565e7b0c052a5f82 Mon Sep 17 00:00:00 2001
From: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Wed, 28 Nov 2012 16:10:28 +0000
Subject: [PATCH] Fix build when srcdir != builddir

When ./configure'd in a directory other than the srcdir, we need to look
in ${top_builddir)/src for the generated header fcstdint.h

Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
---
 fc-case/Makefile.am      |    2 +-
 fc-glyphname/Makefile.am |    2 +-
 fc-lang/Makefile.am      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fc-case/Makefile.am b/fc-case/Makefile.am
index ad5dc74..6914824 100644
--- a/fc-case/Makefile.am
+++ b/fc-case/Makefile.am
@@ -23,7 +23,7 @@
 # PERFORMANCE OF THIS SOFTWARE.
 #
 
-INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
+INCLUDES=-I${top_builddir}/src -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
 
 TMPL=fccase.tmpl.h
 STMPL=${top_srcdir}/fc-case/${TMPL}
diff --git a/fc-glyphname/Makefile.am b/fc-glyphname/Makefile.am
index 697b5c3..fdba146 100644
--- a/fc-glyphname/Makefile.am
+++ b/fc-glyphname/Makefile.am
@@ -23,7 +23,7 @@
 # PERFORMANCE OF THIS SOFTWARE.
 #
 
-INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
+INCLUDES=-I${top_builddir}/src -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
 
 TMPL=fcglyphname.tmpl.h
 STMPL=${top_srcdir}/fc-glyphname/${TMPL}
diff --git a/fc-lang/Makefile.am b/fc-lang/Makefile.am
index d2eca5b..5c2d1bf 100644
--- a/fc-lang/Makefile.am
+++ b/fc-lang/Makefile.am
@@ -23,7 +23,7 @@
 # PERFORMANCE OF THIS SOFTWARE.
 #
 
-INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
+INCLUDES=-I${top_builddir}/src -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
 
 TMPL=fclang.tmpl.h
 STMPL=${top_srcdir}/fc-lang/fclang.tmpl.h
-- 
1.7.9