diff --git a/Makefile.in b/Makefile.in index ba10968d0..818b0c64b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -30,7 +30,7 @@ CXXFLAGS = @CXXFLAGS@ $(COMMON_FLAGS) -D_GNU_SOURCE MKDIR_P = $(COND_SILENCE)mkdir -p CUDA_FLAGS = @CUDA_FLAGS@ @CUDA_COMPUTE_ARGS@ @DEFS@ -g LDFLAGS = @LDFLAGS@ -LIBS += @LIBS@ @MATHLIBS@ -lm -pthread +LIBS += @LIBS@ @CUDA_LIB@ @MATHLIBS@ -lm -pthread INC = -Isrc -I$(srcdir)/src -I$(srcdir)/test \ @INC@ CUDA_INC = @CUDA_INC@ -Isrc -I$(srcdir)/src diff --git a/configure.ac b/configure.ac index b995ec585..27ac9fd89 100644 --- a/configure.ac +++ b/configure.ac @@ -584,7 +584,6 @@ fi if test "$FOUND_CUDA" = yes; then AC_DEFINE([HAVE_CUDA], [1], [CUDA is present on the system]) OBJS="$OBJS src/cuda_wrapper.o" - LIBS="$LIBS $CUDA_LIB" if test $system != Windows; then POST_COMPILE_MSG="$POST_COMPILE_MSG\n***\nYou have compiled in sort of CUDA code.\nIn order to use use it compression and \ decompression, you will need to have CUDA libraries visible to your OS.\n\ @@ -608,6 +607,7 @@ fi ENSURE_FEATURE_PRESENT([$cuda_req], [$FOUND_CUDA], [CUDA not found]) AC_SUBST(CUDA_INC) +AC_SUBST(CUDA_LIB) AC_SUBST(CUDA_COMPILER) AC_SUBST(CUDA_COMPUTE_ARGS)