# HG changeset patch
# User Christian Taedcke <hacking@taedcke.com>
# Date 1324550588 -3600
# Node ID 352c42b20441c7ec77638d524cb8d78ac91a83de
# Parent  f511d955ac3030a997762c0af4fdce0437473098
FIXED: - adapted paths for current vscom driver
       - removed chmod +x vs_can_api.dll;
       - added option -o to unzip command to overwrite existing files

diff -r f511d955ac30 -r 352c42b20441 configure
--- a/configure	Thu Dec 22 11:42:44 2011 +0100
+++ b/configure	Thu Dec 22 11:43:08 2011 +0100
@@ -415,7 +415,17 @@
 
 
 if [ "$SUB_CAN_DRIVER" = "vscom" ]; then
-    SUB_CAN_DLL_CFLAGS=$SUB_CAN_DLL_CFLAGS\ -lvs_can_api
+    if  [ "$SUB_OS_NAME" = "Linux" ]; then
+	if [ "$SUB_ARCH_NAME" = "x86" ]; then
+	    SUB_CAN_DLL_CFLAGS=$SUB_CAN_DLL_CFLAGS\ -LLinux\ -lvs_can_api
+        elif [ "$SUB_ARCH_NAME" = "x86_64" ]; then
+	    SUB_CAN_DLL_CFLAGS=$SUB_CAN_DLL_CFLAGS\ -L\'Linux\ x86-64\'\ -lvs_can_api_x86-64
+	else
+	    echo "!!! ERROR !!! Please adapt the configure script for your SUB_ARCH_NAME" $SUB_ARCH_NAME
+        fi
+    else
+	echo "!!! ERROR !!! Please adapt the configure script for your SUB_OS_NAME" $SUB_OS_NAME
+    fi
 fi
 
 if [ "$SUB_CAN_DRIVER" = "anagate_win32" ]; then
diff -r f511d955ac30 -r 352c42b20441 drivers/can_vscom/Makefile.in
--- a/drivers/can_vscom/Makefile.in	Thu Dec 22 11:42:44 2011 +0100
+++ b/drivers/can_vscom/Makefile.in	Thu Dec 22 11:43:08 2011 +0100
@@ -31,7 +31,7 @@
 CAN_DRIVER = SUB_CAN_DRIVER
 TIMERS_DRIVER = SUB_TIMERS_DRIVER
 ENABLE_DLL_DRIVERS=SUB_ENABLE_DLL_DRIVERS
-CAN_DLL_CFLAGS=SUB_CAN_DLL_CFLAGS -L.
+CAN_DLL_CFLAGS=SUB_CAN_DLL_CFLAGS
 VSCAN_API_FILENAME=VSCAN_API_latest.zip
 
 # define target specific environment
@@ -68,8 +68,7 @@
 vs_can_api.h:
 	wget http://www.vscom.de/download/multiio/linux/driver/${VSCAN_API_FILENAME}
 	@if which unzip &> /dev/null; then \
-	unzip ${VSCAN_API_FILENAME}; \
-	chmod +x vs_can_api.dll; \
+	unzip -o ${VSCAN_API_FILENAME}; \
 	else \
 	echo "No unzip found. Please decompress ${VSCAN_API_FILENAME} manually"; \
 	exit 1; \
@@ -86,7 +85,7 @@
 install: libcanfestival_$(CAN_DRIVER).so
 	mkdir -p $(PREFIX)/lib/
 	cp $< $(PREFIX)/lib/
-		
+
 uninstall:
 	rm -f $(TARGET_SOFILES)