Use native glib-compile-schemas when cross compiling

diff --git a/configure.in b/configure.in
index 02860f1..1c71637 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2732,7 +2732,8 @@ int error = EILSEQ;
 AC_MSG_RESULT($have_eilseq)
 
 dnl ******************************************************************
-dnl *** Look for glib-genmarshal in PATH if we are cross-compiling ***
+dnl *** If we are cross-compiling, look for glib-genmarshal and    ***
+dnl *** glib-compile-schemas in PATH                               ***
 dnl ******************************************************************
 
 AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
@@ -2742,6 +2743,11 @@ if test $cross_compiling = yes; then
   if test x$GLIB_GENMARSHAL = xno; then
     AC_MSG_ERROR(Could not find a glib-genmarshal in your PATH)
   fi
+
+  AC_PATH_TOOL(GLIB_COMPILE_SCHEMAS, glib-compile-schemas, no)
+  if test x$GLIB_COMPILE_SCHEMAS = xno; then
+    AC_MSG_ERROR(Could not find a glib-compile-schemas in your PATH)
+  fi
 fi
 
 dnl **************************

diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index 0abfa5a..aaad1c1 100644 (file)
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -313,8 +313,14 @@ test.mo: de.po
        $(MKDIR_P) de/LC_MESSAGES; \
        cp -f test.mo de/LC_MESSAGES
 
+if CROSS_COMPILING
+  glib_compile_schemas=$(GLIB_COMPILE_SCHEMAS)
+else
+  glib_compile_schemas=$(top_builddir)/gio/glib-compile-schemas
+endif
+
 gschemas.compiled:
-       $(top_builddir)/gio/glib-compile-schemas --targetdir=$(abs_builddir) $(srcdir)
+       $(glib_compile_schemas) --targetdir=$(abs_builddir) $(srcdir)
 
 DISTCLEANFILES =                                        \
        applications/mimeinfo.cache                     \