From b9e2f0a9aa4d88f37a6adf6d7ec4e1c3d5df496e Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Wed, 26 May 2010 11:17:33 +0000 Subject: [PATCH] Check for RTAI include directory "${RTAI_DIR}/include/rtai" before checking for "${RTAI_DIR}/include". This is because Debian uses --with-rtaidir=/usr but puts the RTAI include files in /usr/include/rtai. --- m4/rtai.m4 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/m4/rtai.m4 b/m4/rtai.m4 index d059d21c..349d7516 100644 --- a/m4/rtai.m4 +++ b/m4/rtai.m4 @@ -13,14 +13,14 @@ AC_DEFUN([DS_RTAI], if test "${ENABLE_RTAI}" = "yes" -a \( "${CONFIG_RTHAL}" != "no" -o "${CONFIG_ADEOS}" != "no" -o "${CONFIG_IPIPE}" != "no" \); then AC_MSG_CHECKING([RTAI directory ${RTAI_DIR}]) - if [[ -d ${RTAI_DIR}/include ]] ; then + if [[ -d ${RTAI_DIR}/include/rtai ]] ; then # for Debian + RTAI_CFLAGS="-I${RTAI_DIR}/include/rtai" + elif [[ -d ${RTAI_DIR}/include ]] ; then RTAI_CFLAGS="-I${RTAI_DIR}/include" + elif [[ -d ${RTAI_DIR}/rtai-core/include ]] ; then + RTAI_CFLAGS=" -I${RTAI_DIR} -I${RTAI_DIR}/rtai-core/include" else - if [[ -d ${RTAI_DIR}/rtai-core/include ]] ; then - RTAI_CFLAGS=" -I${RTAI_DIR} -I${RTAI_DIR}/rtai-core/include" - else - AC_MSG_ERROR([incorrect RTAI directory?]) - fi + AC_MSG_ERROR([incorrect RTAI directory?]) fi $1 AC_MSG_RESULT([found]) -- 2.26.2