[glib] Let GLIB_SETTINGS macro use glib-compile-schemas from PATH when cross compiling
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Let GLIB_SETTINGS macro use glib-compile-schemas from PATH when cross compiling
- Date: Tue, 15 Jun 2010 04:41:34 +0000 (UTC)
commit a500de820260915c6b4d4724d6029ee5b8552ae7
Author: Hib Eris <hib hiberis nl>
Date: Tue Jun 15 00:39:46 2010 -0400
Let GLIB_SETTINGS macro use glib-compile-schemas from PATH when cross compiling
See bug #621172
m4macros/gsettings.m4 | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/m4macros/gsettings.m4 b/m4macros/gsettings.m4
index b686989..b74530e 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]