fix bug MasterMap1 callback

[CanFestival-3.git] / configure

diff --git a/configure b/configure
index e3bf48e405588b0aa070077458dc399ac5e03d35..3ccfe55da68211f083a2461a86b3b67a365d619e 100755 (executable)
--- a/configure
+++ b/configure
@@ -92,6 +92,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                              #
 ###########################################################################
@@ -257,7 +261,7 @@ fi
 ###########################################################################
 #                      DEFAULT TARGET/DRIVERS GUESSING                    #
 ###########################################################################
-# If target not specified, try to gess one
+# If target not specified, try to guess one
 if [ "$SUB_TARGET" = "" ]; then
        if [ "$SUB_OS_NAME" = "CYGWIN" ]; then
                echo "Choosing unix (cygwin) target"
@@ -273,7 +277,7 @@ if [ "$SUB_TARGET" = "" ]; then
        fi
 fi
 
-# Try to gess can
+# Try to guess can
 if [ "$SUB_CAN_DRIVER" = "" ]; then
        if [ "$SUB_TARGET" = "unix" ]; then
                if [ -e /usr/lib/libpcan.so ]; then 
@@ -282,6 +286,12 @@ if [ "$SUB_CAN_DRIVER" = "" ]; then
                elif [ "$SUB_OS_NAME" = "CYGWIN" -a "PCAN_LIB" != "" ]; then
                        echo "Choosing installed Peak driver as CAN driver."
                        SUB_CAN_DRIVER=peak_win32               
+               elif [ -e /usr/lib/libcanlib.so ]; then 
+                       echo "Choosing installed Kvaser driver as CAN driver. (unix)"
+                       SUB_CAN_DRIVER=kvaser
+               elif [ "$SUB_OS_NAME" = "CYGWIN" -a "$KVASER_DLL_PATH" != "" ]; then
+                       echo "Choosing installed Kvaser driver as CAN driver. (cygwin)"
+                       SUB_CAN_DRIVER=kvaser
                else
                        echo "Choosing virtual CAN driver."
                        SUB_CAN_DRIVER=virtual
@@ -309,6 +319,21 @@ if [ "$SUB_CAN_DRIVER" = "peak" ]; then
        fi
 fi
 
+# Warn for unstalled kvaser driver if choosen
+if [ "$SUB_CAN_DRIVER" = "kvaser" ]; then
+       if [ "$SUB_OS_NAME" = "CYGWIN" ]; then
+        if [ ! -e "$KVASER_DLL_PATH/canlib32.dll" ]; then 
+            echo "Kvaser driver hasn't been installed (cygwin)"
+            exit -1
+        fi
+    elif  [ "$SUB_OS_NAME" = "LINUX" ]; then
+        if [ ! -e /usr/lib/libcanlib.so ]; then 
+            echo "Kvaser driver hasn't been installed (unix)"
+            exit -1
+        fi
+       fi
+fi
+
 ###########################################################################
 #              TARGET/DRIVER SPECIFIC CFLAGS and OPTIONS                  #
 ###########################################################################
@@ -336,13 +361,32 @@ fi
 
 #### CAN_DRIVER ####
 
+if [ "$SUB_CAN_DRIVER" = "kvaser" ]; then
+       if [ "$SUB_TARGET" = "unix" ]; then
+        if  [ "$SUB_OS_NAME" = "LINUX" ]; then
+            SUB_CAN_DLL_CFLAGS=$SUB_CAN_DLL_CFLAGS\ -lcanlib
+               elif [ "$SUB_OS_NAME" = "CYGWIN" ]; then
+               if [ "$KVASER_INCLUDE_PATH" = "" -o "$KVASER_DLL_PATH" = "" ]; then
+                       echo "!!! ERROR !!! Please set KVASER_DLL_PATH and KVASER_INCLUDE_PATH to appropriate paths ! "
+            else
+                SUB_CAN_DLL_CFLAGS=$SUB_CAN_DLL_CFLAGS\ -L$KVASER_DLL_PATH\ -lcanlib32
+                SUB_PROG_CFLAGS=$SUB_PROG_CFLAGS\ -I$KVASER_INCLUDE_PATH
+            fi
+        fi
+    fi        
+fi
+
 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
+       if [ "$PCAN_HEADER" = "" -o "$PCAN_LIB" = "" ]; then
                echo "!!! ERROR !!! Please set PCAN_LIB PCAN_HEADER [PCAN_INCLUDE] to appropriate paths ! "
        fi
        SUB_CAN_DLL_CFLAGS=$SUB_CAN_DLL_CFLAGS\ -liberty\ \'$PCAN_LIB\'
@@ -388,9 +432,17 @@ if [ "$SUB_TIMERS_DRIVER" = "unix" ]; then
 fi
 
 if [ "$SUB_TIMERS_DRIVER" = "xeno" ]; then
-       SUB_EXE_CFLAGS=$SUB_EXE_CFLAGS\ -lnative\ -lrtdm\ -L`$XENO_CONFIG --library-dir`
-       SUB_PROG_CFLAGS=$SUB_PROG_CFLAGS\ `$XENO_CONFIG --xeno-cflags`
-       RTCAN_SOCKET=1
+       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\ -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
 
 if [ "$SUB_TIMERS_DRIVER" = "kernel" ]; then
@@ -693,6 +745,7 @@ elif [ "$SUB_TARGET" = "unix" ]; then
        MAKEFILES=$MAKEFILES\
 \      examples/TestMasterSlave/Makefile.in\
 \      examples/TestMasterSlaveLSS/Makefile.in\
+\      examples/SillySlave/Makefile.in\
 \      examples/TestMasterMicroMod/Makefile.in
 fi
 
@@ -700,6 +753,7 @@ if [ "$SUB_TARGET" = "win32" ]; then
        MAKEFILES=$MAKEFILES\
 \      examples/TestMasterSlave/Makefile.in\
 \      examples/TestMasterSlaveLSS/Makefile.in\
+\      examples/SillySlave/Makefile.in\
 \      examples/TestMasterMicroMod/Makefile.in
 fi