Merge branch 'feature/cuda' of github.com:dmalhotra/pvfmm into feature/cuda

Conflicts:
	INSTALL

INSTALL

@@ -87,9 +87,8 @@ are given below:
      ./configure MPICXX="CC" F77="ftn"
 
 `Stampede (TACC)'
-     module load fftw3
-     module load cuda/5.5
-     ./configure CXXFLAGS="-mavx -wd3218 -wd2571 -wd2570 -wd2568 -wd161" --with-fftw="$TACC_FFTW3_DIR" FLIBS=" " --with-cuda="$TACC_CUDA_DIR" NVCCFLAGS="-arch=compute_30 -code=sm_30"
+     module load fftw3 cuda
+     ./configure CXXFLAGS="-mavx -wd3218 -wd2571 -wd2570 -wd2568 -wd161" --with-fftw="$TACC_FFTW3_DIR" FLIBS=" " --with-cuda="$TACC_CUDA_DIR"
 
 `Ronaldo (ICES)'
      ./configure CXXFLAGS="-msse4" --with-fftw="$FFTW_DIR"

m4/ax_check_cuda.m4

@@ -142,7 +142,7 @@ EOF
    CXXFLAGS=${ax_save_CXXFLAGS}
    LIBS=${ax_save_LIBS}
 
-   AC_DEFINE(HAVE_CUDA,1,[Define if we have FFTW])
+   AC_DEFINE(HAVE_CUDA,1,[Define if we have CUDA])
 fi