diff options
| author | Hib Eris <hib@hiberis.nl> | 2010-06-15 00:39:46 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-06-15 00:39:46 -0400 |
| commit | a500de820260915c6b4d4724d6029ee5b8552ae7 (patch) | |
| tree | 42ff5a7282ad9dda95d8121fdd7e4de14763601f /m4macros | |
| parent | b079d6a54616514e80b552ebe0a42f45e379b0e8 (diff) | |
Let GLIB_SETTINGS macro use glib-compile-schemas from PATH when cross compiling
See bug #621172
Diffstat (limited to 'm4macros')
| -rw-r--r-- | m4macros/gsettings.m4 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/m4macros/gsettings.m4 b/m4macros/gsettings.m4 index b68698980..b74530eab 100644 --- a/m4macros/gsettings.m4 +++ b/m4macros/gsettings.m4 @@ -17,7 +17,12 @@ AC_DEFUN([GLIB_GSETTINGS], AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) PKG_PROG_PKG_CONFIG([0.16]) AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) - AC_SUBST(GLIB_COMPILE_SCHEMAS, `$PKG_CONFIG --variable glib_compile_schemas gio-2.0`) + if test x$cross_compiling != xyes; then + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + else + AC_PATH_TOOL(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) + fi + AC_SUBST(GLIB_COMPILE_SCHEMAS) if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then AC_MSG_ERROR([glib-compile-schemas not found.]) fi |