summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2010-07-22 23:15:33 -0400
committerBehdad Esfahbod <behdad@behdad.org>2010-07-22 23:24:08 -0400
commit9b43da625483b68aa8702d217523bf9d8a8100d6 (patch)
tree76131f4f370fc3ff238507b3a40e98c4c25e2c52
parente94a21a9b52a5b9f9e4a5f1e19f9c84a16bf2838 (diff)
downloadpango-9b43da625483b68aa8702d217523bf9d8a8100d6.tar.gz
Bug 617772 - pango fails to build from git outside source tree
Depends on gobject-introspection >= 0.6.14, where introspection sources are referenced via VPATH. Remove $(srcdir) prefix in sources. Signed-off-by: Theppitak Karoonboonyanan <thep@linux.thai.net>
-rw-r--r--configure.in2
-rw-r--r--pango/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index 86eb4df9..0fd3f609 100644
--- a/configure.in
+++ b/configure.in
@@ -481,7 +481,7 @@ PKG_CHECK_MODULES(LIBTHAI, libthai >= $LIBTHAI_REQUIRED_VERSION, have_libthai=tr
# Checks for GObject Introspection
#
-GOBJECT_INTROSPECTION_CHECK([0.6.7])
+GOBJECT_INTROSPECTION_CHECK([0.6.14])
#
# Modules to build
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 37510fa0..69b08005 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -171,7 +171,7 @@ Pango_1_0_gir_PACKAGES = gobject-2.0 cairo freetype2
Pango_1_0_gir_INCLUDES = GObject-2.0 cairo-1.0
Pango_1_0_gir_LIBS = libpango-1.0.la
Pango_1_0_gir_CFLAGS = -I$(top_srcdir) $(PANGO_CFLAGS)
-Pango_1_0_gir_FILES = $(addprefix $(srcdir)/,$(pango_introspection_files))
+Pango_1_0_gir_FILES = $(pango_introspection_files)
# ------------------- libpangox -------------------