bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use xeno_config for xenomai version detection

This commit is contained in:
Bjarne von Horn 2023-11-16 13:48:31 +01:00
parent 023d989ee3
commit e76109c854
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -728,12 +728,12 @@ AC_MSG_CHECKING([for Xenomai path])
if test -z "${xenomaidir}"; then if test -z "${xenomaidir}"; then
AC_MSG_RESULT([not specified.]) AC_MSG_RESULT([not specified.])
else 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}!]) AC_MSG_ERROR([no Xenomai installation found in ${xenomaidir}!])
fi fi
AC_MSG_RESULT([$xenomaidir]) 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##\"}
xenomai_ver=${xenomai_ver%%\"} xenomai_ver=${xenomai_ver%%\"}
echo "xenomai version: " $xenomai_ver echo "xenomai version: " $xenomai_ver

1
master/Kbuild.in
View File

@ -80,7 +80,6 @@ ifeq (@ENABLE_RTDM@,1)
ifeq (@ENABLE_XENOMAI_V3@, 1) ifeq (@ENABLE_XENOMAI_V3@, 1)
ec_master-objs += rtdm_xenomai_v3.o ec_master-objs += rtdm_xenomai_v3.o
CFLAGS_rtdm.o := -I@XENOMAI_DIR@/include
else else
ec_master-objs += rtdm.o ec_master-objs += rtdm.o
endif endif