diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-02-18 16:03:35 +0200 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2016-05-03 16:04:53 +0300 |
| commit | cc276dfa41e24596b12efc04cf2ca625f868164d (patch) | |
| tree | ee27df45c69e09a20ba6a4170ebb2ff39e33294d | |
| parent | aaafffe03949a673fd2f2d957900e0569ece440c (diff) | |
configure.ac: Don't use AC_CANONICAL_* macro calls
Check autoconfs $cross_compiling instead as AC_CANONICAL_HOST call
will fail if the host cpu is not recognised (which can happen when
e.g. Yocto builds for "allarch").
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 5b48b1a..3d45a4b 100644 --- a/configure.ac +++ b/configure.ac @@ -15,13 +15,10 @@ AC_CONFIG_MACRO_DIR([m4]) AC_SUBST([WAYLAND_PROTOCOLS_VERSION], [wayland_protocols_version]) -AC_CANONICAL_HOST -AC_CANONICAL_BUILD - AC_ARG_VAR([wayland_scanner], [The wayland-scanner executable]) AC_PATH_PROG([wayland_scanner], [wayland-scanner]) if test x$wayland_scanner = x; then - if test x$host = x$build; then + if test "x$cross_compiling" != "xyes"; then PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner]) wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner` else |