Honor GDK_PIXBUF_CSOURCE from configure.in when cross-compiling. (#87099,

Tue Jul 30 15:39:06 2002  Owen Taylor  <otaylor@redhat.com>

        * demos/Makefile.am: Honor GDK_PIXBUF_CSOURCE from
        configure.in when cross-compiling. (#87099,
        J. Ali Harlow)

ChangeLog

+Tue Jul 30 15:39:06 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* demos/Makefile.am: Honor GDK_PIXBUF_CSOURCE from
+	configure.in when cross-compiling. (#87099,
+	J. Ali Harlow)
+
 Mon Jul 29 16:42:30 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkimcontext.c (gtk_im_context_real_get_surrounding):

ChangeLog.pre-2-10

+Tue Jul 30 15:39:06 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* demos/Makefile.am: Honor GDK_PIXBUF_CSOURCE from
+	configure.in when cross-compiling. (#87099,
+	J. Ali Harlow)
+
 Mon Jul 29 16:42:30 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkimcontext.c (gtk_im_context_real_get_surrounding):

ChangeLog.pre-2-2

+Tue Jul 30 15:39:06 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* demos/Makefile.am: Honor GDK_PIXBUF_CSOURCE from
+	configure.in when cross-compiling. (#87099,
+	J. Ali Harlow)
+
 Mon Jul 29 16:42:30 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkimcontext.c (gtk_im_context_real_get_surrounding):

ChangeLog.pre-2-4

+Tue Jul 30 15:39:06 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* demos/Makefile.am: Honor GDK_PIXBUF_CSOURCE from
+	configure.in when cross-compiling. (#87099,
+	J. Ali Harlow)
+
 Mon Jul 29 16:42:30 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkimcontext.c (gtk_im_context_real_get_surrounding):

ChangeLog.pre-2-6

+Tue Jul 30 15:39:06 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* demos/Makefile.am: Honor GDK_PIXBUF_CSOURCE from
+	configure.in when cross-compiling. (#87099,
+	J. Ali Harlow)
+
 Mon Jul 29 16:42:30 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkimcontext.c (gtk_im_context_real_get_surrounding):

ChangeLog.pre-2-8

+Tue Jul 30 15:39:06 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* demos/Makefile.am: Honor GDK_PIXBUF_CSOURCE from
+	configure.in when cross-compiling. (#87099,
+	J. Ali Harlow)
+
 Mon Jul 29 16:42:30 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkimcontext.c (gtk_im_context_real_get_surrounding):

demos/Makefile.am

@@ -32,11 +32,16 @@ noinst_PROGRAMS = 		\
 	testpixbuf-scale 	\
 	pixbuf-demo
 
-test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource$(EXEEXT) apple-red.png gnome-foot.png
+if CROSS_COMPILING
+pixbuf_csource=$(GDK_PIXBUF_CSOURCE)
+else
+pixbuf_csource=GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf/.libs $$topdir/gdk-pixbuf/gdk-pixbuf-csource
+endif
+
+test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource apple-red.png gnome-foot.png
 	(topdir=`cd $(top_builddir) && pwd` ; curdir=`pwd` ; \
 	  cd $(srcdir) &&				     \
-	    GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf/.libs \
-	      $$topdir/gdk-pixbuf/gdk-pixbuf-csource --build-list \
+	      $(pixbuf_csource) --build-list \
 	        apple_red apple-red.png gnome_foot gnome-foot.png >$$curdir/test-inline-pixbufs.h)
 
 testpixbuf_DEPENDENCIES = $(DEPS)