diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/autotools.eclass | 4 | ||||
| -rw-r--r-- | eclass/cmake-utils.eclass | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index bc4032a35136..3039a466b91f 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -258,7 +258,7 @@ _at_uses_pkg() { } _at_uses_autoheader() { _at_uses_pkg A{C,M}_CONFIG_HEADER{S,}; } _at_uses_automake() { _at_uses_pkg AM_INIT_AUTOMAKE; } -_at_uses_gettext() { _at_uses_pkg AM_GNU_GETTEXT_VERSION; } +_at_uses_gettext() { _at_uses_pkg AM_GNU_GETTEXT_{,REQUIRE_}VERSION; } _at_uses_glibgettext() { _at_uses_pkg AM_GLIB_GNU_GETTEXT; } _at_uses_intltool() { _at_uses_pkg {AC,IT}_PROG_INTLTOOL; } _at_uses_gtkdoc() { _at_uses_pkg GTK_DOC_CHECK; } @@ -531,7 +531,7 @@ ALL_AUTOTOOLS_MACROS=( AC_CONFIG_AUX_DIR AC_CONFIG_MACRO_DIR AM_INIT_AUTOMAKE AM_GLIB_GNU_GETTEXT - AM_GNU_GETTEXT_VERSION + AM_GNU_GETTEXT_{,REQUIRE_}VERSION {AC,IT}_PROG_INTLTOOL GTK_DOC_CHECK GNOME_DOC_INIT diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 480cd099648c..012b13f059c8 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -228,6 +228,11 @@ _generator_to_use() { case ${CMAKE_MAKEFILE_GENERATOR} in ninja) + # if ninja is enabled but not installed, the build could fail + # this could happen if ninja is manually enabled (eg. make.conf) but not installed + if ! has_version dev-util/ninja; then + die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR." + fi generator_name="Ninja" ;; emake) |