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

Emil Velikov emil.l.velikov at gmail.com
Tue Feb 17 07:13:32 PST 2015

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])
 AC_PATH_PROG([wayland_scanner], [wayland-scanner])
 if test x$wayland_scanner = x; then
-	AC_MSG_ERROR([wayland-scanner is needed to compile weston])
+	wayland_scanner=`$PKG_CONFIG --variable=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])

More information about the wayland-devel mailing list