[Emc-commit] rtapi Makefile.inc,1.1.1.1,1.2 configure,1.1.1.1,1.2

[<jmk...@us...>]

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

Modified Files:
	Makefile.inc configure 
Log Message:
changed 'ksyms' to '/sbin/ksyms' in configure script


Index: Makefile.inc
===================================================================
RCS file: /cvsroot/emc/rtapi/Makefile.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.inc	8 Jul 2003 15:54:38 -0000	1.1.1.1
--- Makefile.inc	19 Jul 2003 01:32:47 -0000	1.2
***************
*** 3,24 ****
  # Makefile add-ons from ./configure
  
! RTAPI_HOME = /proj/foundation/home/proctor/rtapi
  BIN_DIR = $(RTAPI_HOME)/bin
  LIB_DIR = $(RTAPI_HOME)/lib
  RTLIB_DIR = $(RTAPI_HOME)/rtlib
  INC_DIR = $(RTAPI_HOME)/include
! MOD_DIR = /lib/modules/2.2.14-rtl2.2/misc
  CC = gcc
  CFLAGS = -g -I$(INC_DIR)
  CLINK =
! RTDIR = /usr/src/rtlinux-2.2
! RTNAME = rtlinux-2.2
! RTL = 1
  
! # Makefile add-ons from rtlinux-2.2.mk
  
! RTFLAGS = -I$(INC_DIR) -I$(RTDIR)/include -I$(RTDIR)/linux/include -I$(RTDIR)/include/posix -I$(RTDIR)/include/compat -O2 -ffast-math -D__RTL__ -D__KERNEL__ -DMODULE
  ULFLAGS = -g -I$(INC_DIR) -I$(RTDIR)/include
  RTLINK = ld -r -static
! RTAPI = $(RTLIB_DIR)/rtl_rtapi.o
! ULAPI = $(LIB_DIR)/rtl_ulapi.o
--- 3,26 ----
  # Makefile add-ons from ./configure
  
! RTAPI_HOME = /home/John/tempcvs/rtapi
  BIN_DIR = $(RTAPI_HOME)/bin
  LIB_DIR = $(RTAPI_HOME)/lib
  RTLIB_DIR = $(RTAPI_HOME)/rtlib
  INC_DIR = $(RTAPI_HOME)/include
! MOD_DIR = /lib/modules/2.4.18-rtai/misc
  CC = gcc
  CFLAGS = -g -I$(INC_DIR)
  CLINK =
! RTDIR = /usr/src/rtai-24.1.10
! RTNAME = rtai-24.1.10
! RTAI = 1
  
! # 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
! RTAPI = $(RTLIB_DIR)/rtai_rtapi.o
! ULAPI = $(LIB_DIR)/rtai_ulapi.o
! # Use alternate compiler, RTAI doesn't like gcc 2.96
! CC = egcs

Index: configure
===================================================================
RCS file: /cvsroot/emc/rtapi/configure,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** configure	8 Jul 2003 15:54:38 -0000	1.1.1.1
--- configure	19 Jul 2003 01:32:47 -0000	1.2
***************
*** 78,84 ****
  # rtl_request_global_irq, other rtl_ functions for 2.2 kernels
  # __start_rtlinux_funcs, __stop_rtlinux_funcs for 2.4 kernels
! RTLBOOT=$(ksyms -a | grep _rtlinux_ | wc -l)
  if [ $RTLBOOT -eq 0 ] ; then
!     RTLBOOT=$(ksyms -a | grep rtl_ | wc -l)
  fi
  if [ $RTLBOOT -gt 0 ] ; then
--- 78,84 ----
  # rtl_request_global_irq, other rtl_ functions for 2.2 kernels
  # __start_rtlinux_funcs, __stop_rtlinux_funcs for 2.4 kernels
! RTLBOOT=$(/sbin/ksyms -a | grep _rtlinux_ | wc -l)
  if [ $RTLBOOT -eq 0 ] ; then
!     RTLBOOT=$(/sbin/ksyms -a | grep rtl_ | wc -l)
  fi
  if [ $RTLBOOT -gt 0 ] ; then
***************
*** 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=$(ksyms -a | grep _rtai_ | wc -l)
  if [ $RTAIBOOT -gt 0 ] ; then
      echo found RTAI installed in the kernel
--- 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