From 3a649c10d0dc529b96adc3255d9d43ea48edbcc2 Mon Sep 17 00:00:00 2001 From: rofl0r Date: Fri, 23 Sep 2022 17:30:54 +0000 Subject: [PATCH] configure: don't invoke X11 m4 macros when crosscompiling this breaks crosscompilation by adding host includes, if x11 port is targeted. --- configure | 2 ++ configure.ac | 2 ++ 2 files changed, 4 insertions(+) diff --git a/configure b/configure index 16e47a6..12012c6 100755 --- a/configure +++ b/configure @@ -4113,6 +4113,7 @@ fi if test "$with_x" != "no" ; then +if test "$cross_compiling" != "yes" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 $as_echo_n "checking for X... " >&6; } @@ -4306,6 +4307,7 @@ else $as_echo "libraries $x_libraries, headers $x_includes" >&6; } fi +fi if test "$no_x" != "yes" ; then diff --git a/configure.ac b/configure.ac index 1b3a8d3..a5fc762 100644 --- a/configure.ac +++ b/configure.ac @@ -118,7 +118,9 @@ fi if test "$with_x" != "no" ; then +if test "$cross_compiling" != "yes" ; then AC_PATH_X +fi AH_TEMPLATE(HAVE_LIBXEXT) if test "$no_x" != "yes" ; then -- 2.11.4.GIT