diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2010-06-18 22:59:43 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2010-06-18 23:02:32 -0400 |
| commit | 6217c9b41eb369cac48149639369f51b85763986 (patch) | |
| tree | 8d325c9c2d05f5eb022df9afca24369013c2861b /m4macros | |
| parent | 1ed105b19b31bd5265de7d62156732b343c086e3 (diff) | |
| download | glib-6217c9b41eb369cac48149639369f51b85763986.tar.gz | |
Conditional gsettings.m4 support, AC_PATH_PROG
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).
Diffstat (limited to 'm4macros')
| -rw-r--r-- | m4macros/gsettings.m4 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/m4macros/gsettings.m4 b/m4macros/gsettings.m4 index b74530eab..ee97b5732 100644 --- a/m4macros/gsettings.m4 +++ b/m4macros/gsettings.m4 @@ -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=' |