[PATCH weston] configure.ac: make use of wayland-scanner.pc
Bryce Harrington
bryce at osg.samsung.com
Mon Feb 23 18:03:04 PST 2015
On Mon, Feb 23, 2015 at 03:10:35PM +0100, sardemff7+wayland at sardemff7.net wrote:
> On 2015-02-17 16:13, 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.
> >
> >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])
> >
> >-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])
> >
>
> Sorry for jumping late in the thread.
>
> With AC_ARG_VAR added:
> Reviewed-by: Quentin Glidic <sardemff7+wayland at sardemff7.net>
Thanks, applied:
01193ae..32318a5 master -> master
Bryce
More information about the wayland-devel
mailing list