Permalink
Browse files

Fix gdk-pixbuf's move outside the gtk tree.

gdk-pixbuf has been moved outside gtk. Hence, we must check for the
presence of the gdk-pixbuf-2.0 module, and we must patsubst differently
in the Makefile.am of the generator to handle gdk-pixbuf-parts
correctly.

It is known Ubuntu 10.10 is a problem, but it is not known when this
change occurred.
  • Loading branch information...
1 parent c32dd5d commit 84e329e8d4f4681d868d483a2c201afa5b977324 @jlouis jlouis committed Nov 15, 2010
Showing with 6 additions and 3 deletions.
  1. +3 −1 configure.ac
  2. +3 −2 priv/generator/Makefile.am
View
@@ -25,11 +25,13 @@ AM_PATH_PYTHON
dnl AM_PATH_GTK(2.6,[], AC_MSG_ERROR(Cannot find GTK))
dnl Information about GTK+2.
-PKG_CHECK_MODULES(GTK, [gmodule-2.0 libglade-2.0 gtk+-2.0])
+PKG_CHECK_MODULES(GTK, [gmodule-2.0 libglade-2.0 gtk+-2.0, gdk-pixbuf-2.0])
dnl Get the directory that contains the GTK+ include files.
gtk_include_dir=`echo "$GTK_CFLAGS" | sed -n -e 's/^.*-I\([[^ ]]*include\/gtk-2.0\).*$/\1/p'`
AC_SUBST([GTKINC], [$gtk_include_dir])
+gdk_pixbuf_include_dir=`echo "$GTK_CFLAGS" | sed -n -e 's/^.*-I\([[^ ]]*include\/gdk-pixbuf-2.0\).*$/\1/p'`
+AC_SUBST([GDKPIXBUFINC], [$gdk_pixbuf_include_dir])
glib_include_dir=`echo "$GTK_CFLAGS" | sed -n -e 's/^.*-I\([[^ ]]*include\/glib-2.0\).*$/\1/p'`
AC_SUBST([GINC], [$glib_include_dir])
gtk_version="`$PKG_CONFIG --modversion gtk+-2.0`"
@@ -43,12 +43,13 @@ CLEANFILES = $(GEN_INCLUDES) $(BEAMFILES) $(INTERMEDIATES) \
STRUCTS = $(srcdir)/../../c_src/gtknode_structs.c
G_INCLUDES = $(wildcard $(GINC)/*/*.h)
GDK_INCLUDES = $(wildcard $(GTKINC)/gdk/*.h)
-GDK_PIXBUF_INCLUDES = $(wildcard $(GTKINC)/gdk-pixbuf/*.h)
+GDK_PIXBUF_INCLUDES = $(wildcard $(GDKPIXBUFINC)/gdk-pixbuf/*.h)
GTK_INCLUDES = $(wildcard $(GTKINC)/gtk/*.h)
G_WHITE_INCLUDES = \
$(patsubst %, $(GINC)/%, $(shell cat $(srcdir)/g_white.txt))
GDK_WHITE_INCLUDES = \
- $(patsubst %, $(GTKINC)/%, $(shell cat $(srcdir)/gdk_white.txt))
+ $(patsubst gdk-pixbuf/%, $(GDKPIXBUFINC)/gdk-pixbuf/%, \
+ $(patsubst gdk/%, $(GTKINC)/gdk/%, $(shell cat $(srcdir)/gdk_white.txt)))
GTK_WHITE_INCLUDES = \
$(patsubst %, $(GTKINC)/%, $(shell cat $(srcdir)/gtk_white.txt))
BLACKLISTS = $(srcdir)/g_black.txt $(srcdir)/gdk_black.txt \

0 comments on commit 84e329e

Please sign in to comment.