luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 22:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use native glib-compile-schemas when cross compiling

Browse Source
This commit is contained in:
Hib Eris 2010-06-15 00:38:35 -04:00 committed by Matthias Clasen
parent 85210bcf9b
commit b079d6a546
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.in
View File

@ -2732,7 +2732,8 @@ int error = EILSEQ;
AC_MSG_RESULT($have_eilseq) AC_MSG_RESULT($have_eilseq)
dnl ****************************************************************** 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 ****************************************************************** dnl ******************************************************************
AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) 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 if test x$GLIB_GENMARSHAL = xno; then
AC_MSG_ERROR(Could not find a glib-genmarshal in your PATH) AC_MSG_ERROR(Could not find a glib-genmarshal in your PATH)
fi 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 fi
dnl ************************** dnl **************************

8
gio/tests/Makefile.am
View File

@ -313,8 +313,14 @@ test.mo: de.po
$(MKDIR_P) de/LC_MESSAGES; \ $(MKDIR_P) de/LC_MESSAGES; \
cp -f test.mo 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: gschemas.compiled:
$(top_builddir)/gio/glib-compile-schemas --targetdir=$(abs_builddir) $(srcdir) $(glib_compile_schemas) --targetdir=$(abs_builddir) $(srcdir)
DISTCLEANFILES = \ DISTCLEANFILES = \
applications/mimeinfo.cache \ applications/mimeinfo.cache \