From 9bff21f5562747da0e4877032a5338865d073a33 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Tue, 7 May 2002 15:53:08 +0000 Subject: [PATCH] added a new conditional CROSS_COMPILING which indicates ($build != $host). 2002-05-07 Michael Natterer * configure.in: added a new conditional CROSS_COMPILING which indicates ($build != $host). If it is set, look for gdk-pixbuf-csource in PATH. Error out if it was not found. * gtk/stock-icons/Makefile.am: use the gdk-pixbuf-csource found at configure time if CROSS_COMPILING is set, use the one which was just built otherwise. --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ ChangeLog.pre-2-2 | 10 ++++++++++ ChangeLog.pre-2-4 | 10 ++++++++++ ChangeLog.pre-2-6 | 10 ++++++++++ ChangeLog.pre-2-8 | 10 ++++++++++ configure.in | 10 ++++++++++ gtk/stock-icons/Makefile.am | 32 ++++++++++++++++++-------------- 8 files changed, 88 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49cacd3b38..3d6f1addb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2002-05-07 Michael Natterer + + * configure.in: added a new conditional CROSS_COMPILING which + indicates ($build != $host). If it is set, look for + gdk-pixbuf-csource in PATH. Error out if it was not found. + + * gtk/stock-icons/Makefile.am: use the gdk-pixbuf-csource found at + configure time if CROSS_COMPILING is set, use the one which was + just built otherwise. + 2002-05-07 Anders Carlsson * gdk/x11/xsettings-client.c (xsettings_client_process_event): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 49cacd3b38..3d6f1addb8 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +2002-05-07 Michael Natterer + + * configure.in: added a new conditional CROSS_COMPILING which + indicates ($build != $host). If it is set, look for + gdk-pixbuf-csource in PATH. Error out if it was not found. + + * gtk/stock-icons/Makefile.am: use the gdk-pixbuf-csource found at + configure time if CROSS_COMPILING is set, use the one which was + just built otherwise. + 2002-05-07 Anders Carlsson * gdk/x11/xsettings-client.c (xsettings_client_process_event): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 49cacd3b38..3d6f1addb8 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +2002-05-07 Michael Natterer + + * configure.in: added a new conditional CROSS_COMPILING which + indicates ($build != $host). If it is set, look for + gdk-pixbuf-csource in PATH. Error out if it was not found. + + * gtk/stock-icons/Makefile.am: use the gdk-pixbuf-csource found at + configure time if CROSS_COMPILING is set, use the one which was + just built otherwise. + 2002-05-07 Anders Carlsson * gdk/x11/xsettings-client.c (xsettings_client_process_event): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 49cacd3b38..3d6f1addb8 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +2002-05-07 Michael Natterer + + * configure.in: added a new conditional CROSS_COMPILING which + indicates ($build != $host). If it is set, look for + gdk-pixbuf-csource in PATH. Error out if it was not found. + + * gtk/stock-icons/Makefile.am: use the gdk-pixbuf-csource found at + configure time if CROSS_COMPILING is set, use the one which was + just built otherwise. + 2002-05-07 Anders Carlsson * gdk/x11/xsettings-client.c (xsettings_client_process_event): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 49cacd3b38..3d6f1addb8 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +2002-05-07 Michael Natterer + + * configure.in: added a new conditional CROSS_COMPILING which + indicates ($build != $host). If it is set, look for + gdk-pixbuf-csource in PATH. Error out if it was not found. + + * gtk/stock-icons/Makefile.am: use the gdk-pixbuf-csource found at + configure time if CROSS_COMPILING is set, use the one which was + just built otherwise. + 2002-05-07 Anders Carlsson * gdk/x11/xsettings-client.c (xsettings_client_process_event): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 49cacd3b38..3d6f1addb8 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +2002-05-07 Michael Natterer + + * configure.in: added a new conditional CROSS_COMPILING which + indicates ($build != $host). If it is set, look for + gdk-pixbuf-csource in PATH. Error out if it was not found. + + * gtk/stock-icons/Makefile.am: use the gdk-pixbuf-csource found at + configure time if CROSS_COMPILING is set, use the one which was + just built otherwise. + 2002-05-07 Anders Carlsson * gdk/x11/xsettings-client.c (xsettings_client_process_event): diff --git a/configure.in b/configure.in index 0ab5f7aef2..40575fb1a7 100644 --- a/configure.in +++ b/configure.in @@ -879,6 +879,16 @@ fi AM_CONDITIONAL(USE_MMX, test x$use_mmx_asm = xyes) +dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling + +AM_CONDITIONAL(CROSS_COMPILING, test $build != $host) + +if test $CROSS_COMPILING; then + AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no) + if test x$GDK_PIXBUF_CSOURCE = xno; then + AC_MSG_ERROR(Could not find a gdk-pixbuf-csource in your PATH) + fi +fi GDK_PIXBUF_PACKAGES="gmodule-2.0 gobject-2.0" GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB" diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am index fdf9421f4d..9fa7c2f677 100644 --- a/gtk/stock-icons/Makefile.am +++ b/gtk/stock-icons/Makefile.am @@ -257,20 +257,24 @@ VARIABLES6 = @STRIP_BEGIN@ \ noinst_DATA = gtkstockpixbufs.h CLEANFILES = $(noinst_DATA) -pixbuf_dir = $(top_builddir)/gdk-pixbuf +if CROSS_COMPILING +pixbuf_csource=$(GDK_PIXBUF_CSOURCE) +else +pixbuf_csource=GDK_PIXBUF_MODULEDIR=$(top_builddir)/gdk-pixbuf $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource +endif -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: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(IMAGES) + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES1) >$(srcdir)/gtkstockpixbufs.h + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES2) >>$(srcdir)/gtkstockpixbufs.h + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES3) >>$(srcdir)/gtkstockpixbufs.h + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES4) >>$(srcdir)/gtkstockpixbufs.h + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES5) >>$(srcdir)/gtkstockpixbufs.h + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES6) >>$(srcdir)/gtkstockpixbufs.h EXTRA_DIST = $(IMAGES) gtkstockpixbufs.h