Skip to content

Commit 3bbdd3c

Browse files
committed
EVL: Improve configure
1 parent c0364f5 commit 3bbdd3c

1 file changed

Lines changed: 9 additions & 10 deletions

File tree

src/configure.ac

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -212,14 +212,11 @@ AC_SUBST([RTAI_CONFIG])
212212
AC_PATH_PROG([XENOMAI_CONFIG], [xeno-config], [none])
213213
AC_SUBST([XENOMAI_CONFIG])
214214

215-
#Just check a header to decide if EVL is installed
216-
AC_CHECK_HEADER([evl/thread.h],[
217-
AC_MSG_NOTICE([libevl evl/thread.h found, building xenomai4 (EVL)])
218-
CONFIG_USPACE_XENOMAI_EVL=y
219-
],[
220-
AC_MSG_NOTICE([libevl evl/thread.h missing, not building xenomai4 (EVL)])
221-
CONFIG_USPACE_XENOMAI_EVL=n
222-
])
215+
#Xenomai evl
216+
HAS_EVL=n
217+
AC_CHECK_HEADER([evl/evl.h],[
218+
HAS_EVL=y
219+
])
223220

224221
AC_MSG_CHECKING([for realtime API(s) to use])
225222
if test "$RTS" = uspace || test -z "$RTS" -a "$RTAI_CONFIG" = "none" ; then
@@ -257,15 +254,17 @@ if test "$RTS" = uspace || test -z "$RTS" -a "$RTAI_CONFIG" = "none" ; then
257254
AC_SUBST([XENOMAI_CFLAGS])
258255
AC_SUBST([XENOMAI_LDFLAGS])
259256

260-
if test "$CONFIG_USPACE_XENOMAI_EVL" = "n" ; then
257+
if test "$HAS_EVL" = "n" ; then
261258
USPACE_XENOMAI_EVL=
259+
CONFIG_USPACE_XENOMAI_EVL=n
262260
XENOMAI_EVL_CFLAGS=
263261
XENOMAI_EVL_LDFLAGS=
264262
else
265263
USPACE_XENOMAI_EVL=+xenomai4
264+
CONFIG_USPACE_XENOMAI_EVL=y
266265
XENOMAI_EVL_CFLAGS=
267266
XENOMAI_EVL_LDFLAGS=-levl
268-
AC_DEFINE([USPACE_XENOMAI_EVL], [], [Define if uspace realtime should optionally support Xenomai])
267+
AC_DEFINE([USPACE_XENOMAI_EVL], [], [Define if uspace realtime should optionally support Xenomai-evl])
269268
fi
270269

271270
AC_SUBST([CONFIG_USPACE_XENOMAI_EVL])

0 commit comments

Comments
 (0)