rtai: fix includes for build to succeed

[BsAtHome]

This PR addresses some of the build problems discovered in #3873 to make RTAI compile again.

[NTULINUX]

Thank you very much for this!

[hdiethelm]

@BsAtHome Can you also fix an issue of 4e080ac this PR?

After having some confusion why master builds with LXRT real time and 2.9 fails, I discovered that the above commit just disables LXRT accidentally: NTULINUX/RTAI#20

Line 203 should be changed to:
if test -z "$RTS" || test "$RTS" = uspace; then

The reason behind:

./configure --with-realtime=uspace:
RTS = uspace
RTDIR = 

^In that case, RTAI_CONFIG should be autodetected for uspace build.

RTAI kernel RT:

./configure --with-realtime=/usr/realtime-5.4.279-rtai-amd64/
RTS = /usr/realtime-5.4.279-rtai-amd64/
RTDIR = 

or

./configure
RTS = 
RTDIR = 

This works fine.

[BsAtHome]

I'm sorry, but line 203 does not contain what you say it should.

Do you means line 192, as in:

diff --git a/src/configure.ac b/src/configure.ac
index 917c1f69d5..ed1ad16cd5 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -189,7 +189,7 @@ AC_ARG_ENABLE(toolnml,
 
 #at this point if RTS is empty, we need to find RT ourselves
 AC_MSG_CHECKING([for rtai-config])
-if test -z "$RTS"; then
+if test -z "$RTS" || test "$RTS" = uspace; then
   DIRS="/usr/realtime-`uname -r` /usr/realtime /usr/realtime* /usr /usr/src/rtai*"
 else
   DIRS="$RTS"

[hdiethelm]

Sorry, these lines always move, i referred your old commit, in master it's 192. ^^looks fine, thanks!

Full patch, including indentation fix, feel free to apply it on your MR:

diff --git a/src/configure.ac b/src/configure.ac
index 917c1f69d5..ba5c0877b6 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -189,14 +189,15 @@ AC_ARG_ENABLE(toolnml,
 
 #at this point if RTS is empty, we need to find RT ourselves
 AC_MSG_CHECKING([for rtai-config])
-if test -z "$RTS"; then
+if test -z "$RTS" || test "$RTS" = uspace; then
   DIRS="/usr/realtime-`uname -r` /usr/realtime /usr/realtime* /usr /usr/src/rtai*"
 else
   DIRS="$RTS"
 fi
-  RTAI_CONFIG=none
-  for location in $DIRS; do
-    for subdir in . scripts bin; do
+
+RTAI_CONFIG=none
+for location in $DIRS; do
+  for subdir in . scripts bin; do
     for signature in rtai; do
       candidate=$location/$subdir/$signature-config
       if test "$RTAI_CONFIG" = "none" -a -x $candidate; then

[BsAtHome]

Patch added and force pushed.

[andypugh]

Good to go everyone?

[NTULINUX]

Good to go but this still needs:

#3884

[BsAtHome]

Good to go but this still needs:
#3884

Yes, but they are two separate issues.

[hdiethelm]

Good from my side. First merge that one so #3884 can be finally tested and also merged.