[Emc-commit] rtapi configure,1.2,1.3 install_realtime_base,1.1.1.1,1.2 rtai.mk,1.1.1.1,1.2

[<pa...@us...>]

Update of /cvsroot/emc/rtapi
In directory sc8-pr-cvs1:/tmp/cvs-serv32109

Modified Files:
	configure install_realtime_base rtai.mk 
Log Message:
A few small changes to enable the timetask example to work with 2.4.21-adeos

Index: configure
===================================================================
RCS file: /cvsroot/emc/rtapi/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configure	19 Jul 2003 01:32:47 -0000	1.2
--- configure	22 Jul 2003 17:20:21 -0000	1.3
***************
*** 22,25 ****
--- 22,31 ----
  echo MOD_DIR = /lib/modules/$version/misc >> Makefile.inc
  
+ if [ -d /lib/modules/$version/build ] ; then
+     # We have a 2.4 or later kernel if this symlink exists,
+     # so add an include to the correct headers for the kernel running.
+     echo KERNEL_INC = -I/lib/modules/$version/build/include >> Makefile.inc
+ fi
+ 
  echo CC = gcc >> Makefile.inc
  echo CFLAGS = -g -I\$\(INC_DIR\) >> Makefile.inc
***************
*** 88,92 ****
  # ditto for an RTAI boot by looking through the kernel for telltale symbols:
  # set_rtai_callback, remove_rtai_callback for 2.2, 2.4 kernels
! RTAIBOOT=$(/sbin/ksyms -a | grep _rtai_ | wc -l)
  if [ $RTAIBOOT -gt 0 ] ; then
      echo found RTAI installed in the kernel
--- 94,98 ----
  # ditto for an RTAI boot by looking through the kernel for telltale symbols:
  # set_rtai_callback, remove_rtai_callback for 2.2, 2.4 kernels
! RTAIBOOT=$(/sbin/ksyms -a | grep -E '(_rtai_|_adeos_)' | wc -l)
  if [ $RTAIBOOT -gt 0 ] ; then
      echo found RTAI installed in the kernel

Index: install_realtime_base
===================================================================
RCS file: /cvsroot/emc/rtapi/install_realtime_base,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** install_realtime_base	8 Jul 2003 15:54:38 -0000	1.1.1.1
--- install_realtime_base	22 Jul 2003 17:20:21 -0000	1.2
***************
*** 22,28 ****
  
  
! # If the symbol rthal is found in ksyms assume we are using
  # rtai instead of rtlinux.
! if /sbin/ksyms -a | grep rthal >${nullfile} 2>${nullfile} ; then
  
      # Check to see if the rtai module is already installed..
--- 22,28 ----
  
  
! # If the symbol rthal or adeos is found in ksyms assume we are using
  # rtai instead of rtlinux.
! if /sbin/ksyms -a | grep -E '(rthal|adeos)' >${nullfile} 2>${nullfile} ; then
  
      # Check to see if the rtai module is already installed..

Index: rtai.mk
===================================================================
RCS file: /cvsroot/emc/rtapi/rtai.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** rtai.mk	8 Jul 2003 15:54:38 -0000	1.1.1.1
--- rtai.mk	22 Jul 2003 17:20:21 -0000	1.2
***************
*** 2,6 ****
  # Makefile add-ons from rtai.mk
  
! RTFLAGS = -I$(INC_DIR) -I$(RTDIR)/include -O2 -ffast-math -D__KERNEL__ -DMODULE
  ULFLAGS = -g -I$(INC_DIR) -I$(RTDIR)/include
  RTLINK = ld -r -static
--- 2,6 ----
  # Makefile add-ons from rtai.mk
  
! RTFLAGS = $(KERNEL_INC) -I$(INC_DIR) -I$(RTDIR)/include -O2 -ffast-math -D__KERNEL__ -DMODULE
  ULFLAGS = -g -I$(INC_DIR) -I$(RTDIR)/include
  RTLINK = ld -r -static