From: Ian Abbott <abbotti@mev.co.uk>
Date: Wed, 5 Jul 2006 11:30:26 +0000 (+0000)
Subject: Applied patch from Ben Gardiner (blg at mast dot queensu dot ca):
X-Git-Tag: r0_7_71~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cbef3d440a82199594d819ea36029c724a38c343;p=comedi.git

Applied patch from Ben Gardiner (blg at mast dot queensu dot ca):

It appears as though the changes were applied only to configure.ac.

In the current state, setting --disable-rtai will not avoid the check for the
presence of an rtai directory (line 16 in m4/rtai.m4) if the user has an
adeos/ipipe enabled kernel.

In the situation where the users has an adeos/ipipe enabled kernel, and a
non-standard rtai directory and does not wish to build comedi with rtai support
supplying --disable-rtai is not sufficient to complete the configuration script
without error. An additional --with-rtaidir=/non/standard/dir/ must be
specified. This seems counter-intuitive since the user has already supplied the
 --disable-rtai option.
---

diff --git a/m4/rtai.m4 b/m4/rtai.m4
index a3d4e3f6..d059d21c 100644
--- a/m4/rtai.m4
+++ b/m4/rtai.m4
@@ -11,7 +11,7 @@ AC_DEFUN([DS_RTAI],
 	AS_LINUX_CONFIG_OPTION_MODULE([CONFIG_ADEOS])
 	AS_LINUX_CONFIG_OPTION_MODULE([CONFIG_IPIPE])
 	
-	if test "${CONFIG_RTHAL}" != "no" -o "${CONFIG_ADEOS}" != "no" -o "${CONFIG_IPIPE}" != "no" ; then
+	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
 			RTAI_CFLAGS="-I${RTAI_DIR}/include"