[systemd-devel] [PATCH 1/3] build-sys: add explicit support for --diable-nls

[Filipe Brandenburger]

I just noticed the small typo in the subject: s/diable/disable/

Please fix before applying.

Cheers,
Filipe


On Tue, Jun 24, 2014 at 11:06 PM, Filipe Brandenburger
<filbranden at google.com> wrote:
> In particular, disable intltool when --disable-nls is passed to configure.
>
> Tested: Built it on a host without intltool or gettext.
>   $ ./configure --disable-nls --disable-polkit
>   $ make
> ---
>  configure.ac | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>
> diff --git a/configure.ac b/configure.ac
> index bb6018f87dec..31879d3fb410 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -49,7 +49,17 @@ AS_IF([test "x$enable_static" = "xyes"], [AC_MSG_ERROR([--enable-static is not s
>  AS_IF([test "x$enable_largefile" = "xno"], [AC_MSG_ERROR([--disable-largefile is not supported by systemd])])
>
>  # i18n stuff for the PolicyKit policy files
> +AM_NLS
> +AS_IF([test x"$enable_nls" != xno], [
> +    # intltoolize greps for '^(AC|IT)_PROG_INTLTOOL', so it needs to be on its own line
>  IT_PROG_INTLTOOL([0.40.0])
> +])
> +
> +AS_IF([test -z "$INTLTOOL_POLICY_RULE"], [
> +    # If intltool is not available, provide a dummy rule to fail generation of %.policy files with a meaningful error message
> +    INTLTOOL_POLICY_RULE='%.policy: %.policy.in ; @echo "  ITMRG   " $@ && echo "*** intltool support required to build target $@" && false'
> +    AC_SUBST(INTLTOOL_POLICY_RULE)
> +])
>
>  GETTEXT_PACKAGE=systemd
>  AC_SUBST(GETTEXT_PACKAGE)
> --
> 1.9.3
>