Hello,
I have since discovered that the problem I attached a patch for in my
previous email occurs in a few(!) other places. Here is a patch for all of
them, including my original change. Ie: ignore previous patch, use this one:
>From b37a42b62c931e7b2a0c98525108bdd833646cac Mon Sep 17 00:00:00 2001
From: Jon Crowe <jonmc74@xxxxxxxxx>
Date: Fri, 24 May 2013 11:06:08 +0100
Subject: [PATCH] Added BABL_CFLAGS to INCLUDES
---
app/Makefile.am | 1 +
app/actions/Makefile.am | 1 +
app/config/Makefile.am | 1 +
app/core/Makefile.am | 1 +
app/dialogs/Makefile.am | 1 +
app/display/Makefile.am | 1 +
app/file/Makefile.am | 1 +
app/gegl/Makefile.am | 1 +
app/gui/Makefile.am | 1 +
app/menus/Makefile.am | 1 +
app/operations/Makefile.am | 1 +
app/paint/Makefile.am | 1 +
app/pdb/Makefile.am | 1 +
app/plug-in/Makefile.am | 1 +
app/text/Makefile.am | 1 +
app/tools/Makefile.am | 1 +
app/vectors/Makefile.am | 1 +
app/widgets/Makefile.am | 1 +
app/xcf/Makefile.am | 1 +
libgimpcolor/Makefile.am | 1 +
libgimpconfig/Makefile.am | 1 +
libgimpwidgets/Makefile.am | 1 +
22 files changed, 22 insertions(+)
diff --git a/app/Makefile.am b/app/Makefile.am
index ac704be..41756e2 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -114,6 +114,7 @@ INCLUDES = \
$(GTK_CFLAGS) \
$(PANGOCAIRO_CFLAGS) \
$(GEGL_CFLAGS) \
+ $(BABL_CFLAGS) \
-I$(includedir)
# FIXME: core should not depend on xcf
diff --git a/app/actions/Makefile.am b/app/actions/Makefile.am
index cd6dcf7..7e48624 100644
--- a/app/actions/Makefile.am
+++ b/app/actions/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES = \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GEGL_CFLAGS) \
+ $(BABL_CFLAGS) \
$(GTK_CFLAGS) \
-I$(includedir)
diff --git a/app/config/Makefile.am b/app/config/Makefile.am
index 7e70949..400c26f 100644
--- a/app/config/Makefile.am
+++ b/app/config/Makefile.am
@@ -17,6 +17,7 @@ INCLUDES = \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GEGL_CFLAGS) \
+ $(BABL_CFLAGS) \
$(CAIRO_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
diff --git a/app/core/Makefile.am b/app/core/Makefile.am
index eb87117..601be47 100644
--- a/app/core/Makefile.am
+++ b/app/core/Makefile.am
@@ -11,6 +11,7 @@ INCLUDES = \
-I$(top_srcdir)/app \
$(CAIRO_CFLAGS) \
$(GEGL_CFLAGS) \
+ $(BABL_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
diff --git a/app/dialogs/Makefile.am b/app/dialogs/Makefile.am
index 45e7d4a..8ce8e78 100644
--- a/app/dialogs/Makefile.am
+++ b/app/dialogs/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES = \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GEGL_CFLAGS) \
+ $(BABL_CFLAGS) \
$(GTK_CFLAGS) \
-I$(includedir)
diff --git a/app/display/Makefile.am b/app/display/Makefile.am
index 336ccf3..2668e30 100644
--- a/app/display/Makefile.am
+++ b/app/display/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES = \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GEGL_CFLAGS) \
+ $(BABL_CFLAGS) \
$(GTK_CFLAGS) \
-I$(includedir)
diff --git a/app/file/Makefile.am b/app/file/Makefile.am
index 2f34fe9..b09e09a 100644
--- a/app/file/Makefile.am
+++ b/app/file/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES = \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GEGL_CFLAGS) \
+ $(BABL_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
diff --git a/app/gegl/Makefile.am b/app/gegl/Makefile.am
index 6e9238b..533b6a7 100644
--- a/app/gegl/Makefile.am
+++ b/app/gegl/Makefile.am
@@ -10,6 +10,7 @@ INCLUDES = \
-I$(top_srcdir)/app \
$(CAIRO_CFLAGS) \
$(GEGL_CFLAGS) \
+ $(BABL_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
diff --git a/app/gui/Makefile.am b/app/gui/Makefile.am
index 10f9c32..22a165e 100644
--- a/app/gui/Makefile.am
+++ b/app/gui/Makefile.am
@@ -10,6 +10,7 @@ INCLUDES = \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GEGL_CFLAGS) \
+ $(BABL_CFLAGS) \
$(GTK_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
-I$(includedir)
diff --git a/app/menus/Makefile.am b/app/menus/Makefile.am
index b6865f2..9d6214b 100644
--- a/app/menus/Makefile.am
+++ b/app/menus/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES = \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GEGL_CFLAGS) \
+ $(BABL_CFLAGS) \
$(GTK_CFLAGS) \
-I$(includedir)
diff --git a/app/operations/Makefile.am b/app/operations/Makefile.am
index 86cfd8a..b5cda9f 100644
--- a/app/operations/Makefile.am
+++ b/app/operations/Makefile.am
@@ -11,6 +11,7 @@ INCLUDES = \
-I$(top_srcdir)/app \
$(CAIRO_CFLAGS) \
$(GEGL_CFLAGS) \
+ $(BABL_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
diff --git a/app/paint/Makefile.am b/app/paint/Makefile.am
index c2c72e2..df8f57e 100644
--- a/app/paint/Makefile.am
+++ b/app/paint/Makefile.am
@@ -10,6 +10,7 @@ INCLUDES = \
-I$(top_srcdir)/app \
$(CAIRO_CFLAGS) \
$(GEGL_CFLAGS) \
+ $(BABL_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
diff --git a/app/pdb/Makefile.am b/app/pdb/Makefile.am
index 74e6351..b8d4aa4 100644
--- a/app/pdb/Makefile.am
+++ b/app/pdb/Makefile.am
@@ -10,6 +10,7 @@ INCLUDES = \
-I$(top_srcdir)/app \
$(CAIRO_CFLAGS) \
$(GEGL_CFLAGS) \
+ $(BABL_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
diff --git a/app/plug-in/Makefile.am b/app/plug-in/Makefile.am
index bd9053e..0ce724d 100644
--- a/app/plug-in/Makefile.am
+++ b/app/plug-in/Makefile.am
@@ -10,6 +10,7 @@ INCLUDES = \
-I$(top_srcdir)/app \
$(CAIRO_CFLAGS) \
$(GEGL_CFLAGS) \
+ $(BABL_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
diff --git a/app/text/Makefile.am b/app/text/Makefile.am
index 779abf6..4cd917e 100644
--- a/app/text/Makefile.am
+++ b/app/text/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES = \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GEGL_CFLAGS) \
+ $(BABL_CFLAGS) \
$(PANGOCAIRO_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
diff --git a/app/tools/Makefile.am b/app/tools/Makefile.am
index 176749f..a6a676c 100644
--- a/app/tools/Makefile.am
+++ b/app/tools/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES = \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GEGL_CFLAGS) \
+ $(BABL_CFLAGS) \
$(GTK_CFLAGS) \
-I$(includedir)
diff --git a/app/vectors/Makefile.am b/app/vectors/Makefile.am
index 86e3747..3aec666 100644
--- a/app/vectors/Makefile.am
+++ b/app/vectors/Makefile.am
@@ -10,6 +10,7 @@ INCLUDES = \
-I$(top_srcdir)/app \
$(CAIRO_CFLAGS) \
$(GEGL_CFLAGS) \
+ $(BABL_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
diff --git a/app/widgets/Makefile.am b/app/widgets/Makefile.am
index 9e2ff60..cec82ec 100644
--- a/app/widgets/Makefile.am
+++ b/app/widgets/Makefile.am
@@ -11,6 +11,7 @@ INCLUDES = \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GEGL_CFLAGS) \
+ $(BABL_CFLAGS) \
$(GTK_CFLAGS) \
-I$(includedir)
diff --git a/app/xcf/Makefile.am b/app/xcf/Makefile.am
index 32f1cb4..f45c0f7 100644
--- a/app/xcf/Makefile.am
+++ b/app/xcf/Makefile.am
@@ -10,6 +10,7 @@ INCLUDES = \
-I$(top_srcdir)/app \
$(CAIRO_CFLAGS) \
$(GEGL_CFLAGS) \
+ $(BABL_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
diff --git a/libgimpcolor/Makefile.am b/libgimpcolor/Makefile.am
index 20f43fa..306000e 100644
--- a/libgimpcolor/Makefile.am
+++ b/libgimpcolor/Makefile.am
@@ -53,6 +53,7 @@ AM_CPPFLAGS = \
INCLUDES = \
-I$(top_srcdir) \
$(GEGL_CFLAGS) \
+ $(BABL_CFLAGS) \
$(CAIRO_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
diff --git a/libgimpconfig/Makefile.am b/libgimpconfig/Makefile.am
index 2c6d46b..03c7fea 100644
--- a/libgimpconfig/Makefile.am
+++ b/libgimpconfig/Makefile.am
@@ -50,6 +50,7 @@ AM_CPPFLAGS = \
INCLUDES = \
-I$(top_srcdir) \
$(GEGL_CFLAGS) \
+ $(BABL_CFLAGS) \
$(CAIRO_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am
index 98fe0d6..47e49a3 100644
--- a/libgimpwidgets/Makefile.am
+++ b/libgimpwidgets/Makefile.am
@@ -55,6 +55,7 @@ AM_CPPFLAGS = \
INCLUDES = \
-I$(top_srcdir) \
$(GEGL_CFLAGS) \
+ $(BABL_CFLAGS) \
$(GTK_CFLAGS) \
-I$(includedir)
--
1.8.1.2
_______________________________________________
gimp-developer-list mailing list
gimp-developer-list@xxxxxxxxx
https://mail.gnome.org/mailman/listinfo/gimp-developer-list
