luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Conditional gsettings.m4 support, AC_PATH_PROG

Browse Source 
Add new support for conditional enabling of GSettings (as per
bug #616718) and use AC_PATH_PROG instead of AC_PATH_TOOL (as per
bug #621172).
This commit is contained in:
Ryan Lortie 2010-06-18 22:59:43 -04:00
parent 1ed105b19b
commit 6217c9b41e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -2744,7 +2744,7 @@ if test $cross_compiling = yes; then
AC_MSG_ERROR(Could not find a glib-genmarshal in your PATH)
fi
AC_PATH_TOOL(GLIB_COMPILE_SCHEMAS, glib-compile-schemas, no)
AC_PATH_PROG(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

6
m4macros/gsettings.m4
View File

@ -20,11 +20,13 @@ AC_DEFUN([GLIB_GSETTINGS],
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)
AC_PATH_PROG(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.])
ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
else
ifelse([$1],,[:],[$1])
fi
GSETTINGS_RULES='