[PATCH weston] configure.ac: make use of wayland-scanner.pc

[Bryce Harrington]

On Tue, Feb 17, 2015 at 03:13:32PM +0000, Emil Velikov wrote:
> Currently we use the wayland-scanner executable as found with
> AC_PATH_PROG, and then check the presence of wayland-scanner.pc
> 
> Currently the latter is unused even if AC_PATH_PROG fails to find the
> binary. Rework things to use the pkg-config variable as a fall-back.

Sorry to have to ask some rather stupid questions, but I want to make
sure I understand the effects of this before landing.

> Cc: Andrew Oakley <aoakley at espial.com>
> Cc: Bill Spitzak <spitzak at gmail.com>
> Cc: Daniel Stone <daniel at fooishbar.org>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
>  configure.ac | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 1db9f79..b44675f 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -503,11 +503,10 @@ AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes])
>  
>  AC_PATH_PROG([wayland_scanner], [wayland-scanner])
>  if test x$wayland_scanner = x; then
> -	AC_MSG_ERROR([wayland-scanner is needed to compile weston])

Shouldn't there still be an error message generated if the $PKG_CONFIG
run (below) fails?

> +	PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner])

Here's where I think I'm confused.  The main purpose of
PKG_CHECK_MODULES as I understand it is to define CFLAGS and LIBS
variables, so this would be e.g. WAYLAND_SCANNER_CFLAGS and
WAYLAND_SCANNER_LIBS.  Yet I'm not spotting where either of these are
actually used.  We only need the binary, not the library stuff, right?
Is it declaring any other variables or doing other work we need?

> +	wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
>  fi
>  
> -PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
> -
>  AC_CONFIG_FILES([Makefile src/version.h src/weston.pc])
>  
>  AM_CONDITIONAL([HAVE_GIT_REPO], [test -f $srcdir/.git/logs/HEAD])

Bill, Daniel, you two had comments on the earlier incarnation of this
patch, so I'd like to hear if your concerns are addressed or not before
landing this one.

Bryce

> -- 
> 2.3.0
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel