[systemd-devel] [PATCH] build-sys: check for intltool also when polkit is enabled

[Zbigniew Jędrzejewski-Szmek]

On Thu, Jul 31, 2014 at 03:37:40PM +0300, Samuli Suominen wrote:
> 
> On 31/07/14 15:18, Robert Schiele wrote:
> > intltool is needed for nls _and_ polkit, thus the check needs to be
> > changed to do the test whenever one of them is enables.
> >
> > Without this build fails when configured with
> > --disable-nls --enable-polkit
> > ---
> >  configure.ac | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/configure.ac b/configure.ac
> > index 43b6eef..0802cfc 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -62,7 +62,7 @@ AS_IF([test x"$intltool_found" != xyes],
> >        ])
> >  
> >  AM_NLS
> > -AS_IF([test x"$enable_nls" != xno], [
> > +AS_IF([test x"$enable_nls" != xno -o "x$enable_polkit" != xno], [
> >      # intltoolize greps for '^(AC|IT)_PROG_INTLTOOL', so it needs to be on its own line
> >  IT_PROG_INTLTOOL([0.40.0])
> >  ])
> 
> Isn't this scenario already covered by this existing configure.ac test...
Hm, maybe. But the patch indeed fixes a build with --disable-nls --enable-polkit.
Applied.

Zbyszek