From 284014443a30349b81eb0c98e97947a131962b2e Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer <[email protected]> Date: Mon, 10 Jul 2017 09:43:36 +0200 Subject: [PATCH] fix KEYSYMDEFDIR autodetection when crosscompiling
When PKG_CONFIG_SYSROOT_DIR is set library and include paths queried from pkg-config are automatically rewritten to be relative to the given path. This does not apply to any variable queried explicitely using "--variable=". Add the prefix by hand to get the correct paths when cross compiling. Signed-off-by: Rolf Eike Beer <[email protected]> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 9f1953ee..2bbb3a03 100644 --- a/configure.ac +++ b/configure.ac @@ -233,7 +233,7 @@ AC_MSG_CHECKING([keysym definitions]) AC_ARG_WITH([keysymdefdir], [AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h (defaults to xproto include dir)])], [KEYSYMDEFDIR=$withval], - [KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11]) + [KEYSYMDEFDIR=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir xproto`/X11]) if test ! -d "$KEYSYMDEFDIR"; then AC_MSG_ERROR([$KEYSYMDEFDIR doesn't exist or isn't a directory]) -- 2.13.2 -- Rolf Eike Beer, emlix GmbH, http://www.emlix.com Fon +49 551 30664-0, Fax +49 551 30664-11 Bertha-von-Suttner-Str. 9, 37085 Göttingen, Germany Sitz der Gesellschaft: Göttingen, Amtsgericht Göttingen HR B 3160 Geschäftsführung: Heike Jordan, Dr. Uwe Kracke – Ust-IdNr.: DE 205 198 055 emlix – smart embedded open source _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
