[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 847d802b021a376b947905b81b59cbfa69838a54
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 5 09:51:32 2009 +0000

    2009-11-05  Priit Laes  <plaes at plaes.org>
    
            Reviewed by Jan Alonzo.
    
            [Gtk] Build failure with --enable-introspection
            https://bugs.webkit.org/show_bug.cgi?id=31102
    
            Add search and include paths for JSCore-1.0.gir required by
            gobject-introspection tools.
    
            * GNUmakefile.am:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50559 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 16eb433..0392c24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-05  Priit Laes  <plaes at plaes.org>
+
+        Reviewed by Jan Alonzo.
+
+        [Gtk] Build failure with --enable-introspection
+        https://bugs.webkit.org/show_bug.cgi?id=31102
+
+        Add search and include paths for JSCore-1.0.gir required by
+        gobject-introspection tools.
+
+        * GNUmakefile.am:
+
 2009-11-04  Benjamin Otte  <otte at gnome.org>
 
         Reviewed by Gustavo Noronha.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 0800e83..67667b2 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -429,6 +429,7 @@ $(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER)
 	     --pkg gobject-2.0 \
 	     --pkg gtk+-2.0 \
 	     --output $@ \
+	     --add-include-path $(top_srcdir)/WebKit/gtk \
 	     -I$(top_srcdir)/WebKit/gtk \
 	     -I$(top_builddir)/WebKit/gtk \
 	     -I$(top_srcdir)/JavaScriptCore/ForwardingHeaders \
@@ -442,7 +443,7 @@ typelibsdir = $(GIRTYPELIBDIR)
 typelibs_DATA = $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(G_IR_COMPILER)
-	$(AM_V_GEN)$(G_IR_COMPILER) $< -o $@
+	$(AM_V_GEN)$(G_IR_COMPILER) --includedir $(top_srcdir)/WebKit/gtk $< -o $@
 
 EXTRA_DIST += $(JSCORE_GIRSOURCES)
 CLEANFILES += $(WEBKIT_GIRSOURCES) $(typelibs_DATA)

-- 
WebKit Debian packaging