Fixing install script

configure.ac

@@ -98,6 +98,8 @@ AX_BOOST([1.52],[],[echo "boost not found"
 
 ####### Checking for GPU support
 
+AX_CUDA
+
 ## detect for NVCC
 
 if test x"$NVCC_EXIST" = x"yes"; then
@@ -113,8 +115,10 @@ if test x"$NVCC_EXIST" = x"yes"; then
 
   AC_MSG_RESULT($gpu_support)
   if test x"$gpu_support" = x"yes"; then
-        AX_CUDA
 	AC_DEFINE([GPU],[],[GPU support])
+  else
+	CUDA_LIBS=""
+	CUDA_CFLAGS=""
   fi
 else
   gpu_support=no

install

@@ -102,6 +102,7 @@ else
     done
 fi
 
+make clean
 make
 
 if [ $? -ne 0 ]; then

m4/ax_cuda.m4

@@ -57,7 +57,8 @@ AS_IF([test "x$NVCC_EXIST" = "xno"],[],[
           # If $build_cpu contains "_64", append "64" to CUDA_LIBS
           AS_IF([echo $build_cpu | grep -q "_64"],
                 [
-                 AS_IF([-d {CUDA_LIBS}lib64], [ CUDA_LIBS+="64"  ], [ ])
+                 AS_IF([ ! test -d {CUDA_LIBS}lib64 ], [ CUDA_LIBS+="64"  ], [ ])
+                 AS_IF([ ! command -v bumblebee >/dev/null  ], [ CUDA_LIBS+=" -L/usr/lib64/nvidia-bumblebee/ "  ], [])
                 ])
 
           # Append " -lcuda -lcudart" to CUDA_LIBS