Patch to specify out-of-tree gdk-pixbuf-csource for cross compiling

[Michael Natterer <mitch gimp org>]

Hi,

The attached patch adds the configure option --with-gdk-pixbuf-csource
so gtk/stock-icons/Makefile.am does not try to execute an exacutable
which was built for the target platform in the case of cross
compilation.

If you feel this is the right way to solve the problem, I'll
create a similar patch for GLib's glib-genmarshal.

OK to commit?

ciao,
--mitch

Index: configure.in
===================================================================
RCS file: /cvs/gnome/gtk+/configure.in,v
retrieving revision 1.271
diff -u -p -r1.271 configure.in
--- configure.in	2 Apr 2002 12:10:31 -0000	1.271
+++ configure.in	3 May 2002 14:55:01 -0000
@@ -850,6 +850,15 @@ fi
 
 AM_CONDITIONAL(USE_MMX, test x$use_mmx_asm = xyes)
 
+AC_ARG_WITH(gdk_pixbuf_csource, [  --with-gdk-pixbuf-csource=PATH	Use PATH instead of the built gdk-pixbuf-csource to generate stock pixbufs])
+
+if test x$with_gdk_pixbuf_csource = x; then
+  GDK_PIXBUF_CSOURCE='GDK_PIXBUF_MODULEDIR=$(top_builddir)/gdk-pixbuf $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource'
+else
+  GDK_PIXBUF_CSOURCE=$with_gdk_pixbuf_csource
+fi
+
+AC_SUBST(GDK_PIXBUF_CSOURCE)
 
 GDK_PIXBUF_PACKAGES="gmodule-2.0 gobject-2.0"
 GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB"
Index: gtk/stock-icons/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/stock-icons/Makefile.am,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile.am
--- gtk/stock-icons/Makefile.am	29 Mar 2002 06:23:35 -0000	1.20
+++ gtk/stock-icons/Makefile.am	3 May 2002 14:55:01 -0000
@@ -257,20 +257,18 @@ VARIABLES6 = @STRIP_BEGIN@ 									\
 noinst_DATA = gtkstockpixbufs.h
 CLEANFILES = $(noinst_DATA)
 
-pixbuf_dir = $(top_builddir)/gdk-pixbuf
-
-gtkstockpixbufs.h: $(pixbuf_dir)/gdk-pixbuf-csource $(IMAGES)
-	GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \
-	   $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES1) >$(srcdir)/gtkstockpixbufs.h
-	GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \
-	   $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES2) >>$(srcdir)/gtkstockpixbufs.h
-	GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \
-	   $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES3) >>$(srcdir)/gtkstockpixbufs.h
-	GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \
-	   $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES4) >>$(srcdir)/gtkstockpixbufs.h
-	GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \
-	   $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES5) >>$(srcdir)/gtkstockpixbufs.h
-	GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \
-	   $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES6) >>$(srcdir)/gtkstockpixbufs.h
+gtkstockpixbufs.h: $(pixbuf_csource) $(IMAGES)
+	@GDK_PIXBUF_CSOURCE@ \
+	   --raw --build-list $(VARIABLES1) >$(srcdir)/gtkstockpixbufs.h
+	@GDK_PIXBUF_CSOURCE@ \
+	   --raw --build-list $(VARIABLES2) >>$(srcdir)/gtkstockpixbufs.h
+	@GDK_PIXBUF_CSOURCE@ \
+	   --raw --build-list $(VARIABLES3) >>$(srcdir)/gtkstockpixbufs.h
+	@GDK_PIXBUF_CSOURCE@ \
+	   --raw --build-list $(VARIABLES4) >>$(srcdir)/gtkstockpixbufs.h
+	@GDK_PIXBUF_CSOURCE@ \
+	   --raw --build-list $(VARIABLES5) >>$(srcdir)/gtkstockpixbufs.h
+	@GDK_PIXBUF_CSOURCE@ \
+	   --raw --build-list $(VARIABLES6) >>$(srcdir)/gtkstockpixbufs.h
 
 EXTRA_DIST = $(IMAGES) gtkstockpixbufs.h