Added NMT reset callbacks, patch from Edward

[CanFestival-3.git] / configure

diff --git a/configure b/configure
index d6b264c82747be8c82a1b62b8e90960a7449433d..2779332251869a8dc7a3b9b103fe03911e08bf62 100755 (executable)
--- a/configure
+++ b/configure
@@ -67,11 +67,6 @@ LSS_FS_TIMEOUT_MS=100
 #                             DEFAULT BUILD OPTIONS                       #
 ###########################################################################
 
-# Leave empty for automatic detection
-CC=
-CXX=
-LD=
-
 #default target
 SUB_TARGET=
 
@@ -92,6 +87,10 @@ if [ "$XENO_CONFIG" = "" ]; then
        XENO_CONFIG=/usr/xenomai/bin/xeno-config
 fi
 
+if [ "$RTAI_CONFIG" = "" ]; then
+       RTAI_CONFIG=/usr/realtime/bin/rtai-config
+fi
+
 ###########################################################################
 #                          ARGUMENTS PARSING                              #
 ###########################################################################
@@ -102,6 +101,7 @@ while [ $# -ge 1 ]; do
        --cc=*)         CC=$optarg;;
        --cxx=*)        CXX=$optarg;;
        --ld=*)         LD=$optarg;;
+       --binutils=*)   BINUTILS_PREFIX=$optarg;;
        --arch=*)       SUB_ARCH_NAME=$optarg;;
        --os=*)         SUB_OS_NAME=$optarg;;
        --kerneldir=*)  SUB_KERNELDIR=$optarg;;
@@ -157,8 +157,9 @@ while [ $# -ge 1 ]; do
                echo    "                 see http://www.ocera.org/download/components/WP7/lincan-0.3.3.html"
                echo    "               \"can4linux\" can4linux driver"
                echo    "                 see http://www.port.de/engl/canprod/hw_can4linux.html"
-               echo    " --timers=foo  Use 'foo' as TIMERS driver (can be 'unix', 'xeno' or 'kernel')"
-               echo    " --wx=foo  force result of WxWidgets detection (0 or 1)"
+               echo    " --timers=foo  Use 'foo' as TIMERS driver (can be 'unix', 'xeno', 'rtai' or 'kernel')"
+               echo    " --wx=foo      Force result of WxWidgets detection (0 or 1)"
+               echo    " --binutils=path   Override binutils path detection (as regards \$CC content)"
                echo    " --disable-dll Disable run-time dynamic linking of can, led and nvram drivers"
                echo    " --enable-lss  Enable the LSS services"
                echo    " --enable-lss-fs  Enable the LSS FastScan service"
@@ -376,6 +377,10 @@ if [ "$SUB_CAN_DRIVER" = "peak_linux" ]; then
     SUB_CAN_DLL_CFLAGS=$SUB_CAN_DLL_CFLAGS\ -lpcan
 fi
 
+if [ "$SUB_CAN_DRIVER" = "vscom" ]; then
+    SUB_CAN_DLL_CFLAGS=$SUB_CAN_DLL_CFLAGS\ -lvs_can_api
+fi
+
 PW32DIR=drivers/can_peak_win32
 if [ "$SUB_CAN_DRIVER" = "peak_win32" ]; then
        if [ "$PCAN_HEADER" = "" -o "$PCAN_LIB" = "" ]; then
@@ -426,7 +431,14 @@ fi
 if [ "$SUB_TIMERS_DRIVER" = "xeno" ]; then
        RT_LIB_DIR=`$XENO_CONFIG --library-dir`\ -Wl,-rpath\ `$XENO_CONFIG --library-dir`
     SUB_EXE_CFLAGS=$SUB_EXE_CFLAGS\ `$XENO_CONFIG --xeno-ldflags`\ -L$RT_LIB_DIR\ -lnative\ -lrtdm
-       SUB_PROG_CFLAGS=$SUB_PROG_CFLAGS\ `$XENO_CONFIG --xeno-cflags`
+       SUB_PROG_CFLAGS=$SUB_PROG_CFLAGS\ -DUSE_XENO\ `$XENO_CONFIG --xeno-cflags`
+    RTCAN_SOCKET=1
+fi
+
+if [ "$SUB_TIMERS_DRIVER" = "rtai" ]; then
+       RT_LIB_DIR=`$RTAI_CONFIG --library-dir`\ -Wl,-rpath\ `$RTAI_CONFIG --library-dir`
+    SUB_EXE_CFLAGS=$SUB_EXE_CFLAGS\ `$RTAI_CONFIG --lxrt-ldflags`\ -L$RT_LIB_DIR\ -llxrt\ -lrtdm
+       SUB_PROG_CFLAGS=$SUB_PROG_CFLAGS\ -DUSE_RTAI\ `$RTAI_CONFIG --lxrt-cflags`
     RTCAN_SOCKET=1
 fi
 
@@ -481,7 +493,11 @@ fi
 
 echo "Using ${CC} as a C compiler"
 
-SUB_BINUTILS_PREFIX=`echo "$CC" | sed 's/gcc$//'`
+if [ "$BINUTILS_PREFIX" = "" ]; then
+       SUB_BINUTILS_PREFIX=`echo "$CC" | sed 's/gcc$//'`
+else
+       SUB_BINUTILS_PREFIX=$BINUTILS_PREFIX
+fi
 
 if [ "$CXX" = "" ]; then
        CXX=${SUB_BINUTILS_PREFIX}g++