From e76109c854abc0ea3bdfbaf452103cb3771133ff Mon Sep 17 00:00:00 2001
From: Bjarne von Horn <vh@igh.de>
Date: Thu, 16 Nov 2023 13:48:31 +0100
Subject: [PATCH] Use xeno_config for xenomai version detection

---
 configure.ac     | 4 ++--
 master/Kbuild.in | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index c222f240..ffd5bc57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -728,12 +728,12 @@ AC_MSG_CHECKING([for Xenomai path])
 if test -z "${xenomaidir}"; then
     AC_MSG_RESULT([not specified.])
 else
-    if test \! -r ${xenomaidir}/include/xeno_config.h; then
+    if test \! -x ${xenomaidir}/bin/xeno-config; then
         AC_MSG_ERROR([no Xenomai installation found in ${xenomaidir}!])
     fi
     AC_MSG_RESULT([$xenomaidir])
 
-    xenomai_ver=`grep -R "VERSION_STRING" ${xenomaidir}/include/xeno_config.h | awk '{print $3}'`
+    xenomai_ver=`$xenomaidir/bin/xeno-config --version`
     xenomai_ver=${xenomai_ver##\"}
     xenomai_ver=${xenomai_ver%%\"}
     echo "xenomai version: " $xenomai_ver
diff --git a/master/Kbuild.in b/master/Kbuild.in
index a0c9be6d..8ec1c573 100644
--- a/master/Kbuild.in
+++ b/master/Kbuild.in
@@ -80,7 +80,6 @@ ifeq (@ENABLE_RTDM@,1)
 
 ifeq (@ENABLE_XENOMAI_V3@, 1)
 ec_master-objs += rtdm_xenomai_v3.o
-CFLAGS_rtdm.o := -I@XENOMAI_DIR@/include
 else
 ec_master-objs += rtdm.o
 endif