replace preprocessor with compiler variable

Author: adalisan

configure

@@ -11,12 +11,15 @@ ALL_CXXFLAGS=`"${R_HOME}/bin/R" CMD config ALL_CXXFLAGS`
 
 sed -e "s|@GSL_LIBS@|${GSL_LIBS}|" \
 -e "s|@GSL_CFLAGS@|${GSL_CFLAGS}|" \
--e "s|@CC@|${CXX}|" \
+-e "s|@CC@|${CC}|" \
+-e "s|@CPP@|${CPP}|" \
+-e "s|@CXX@|${CXX}|" \
 -e "s|@CFLAGS@|${CXXFLAGS}|" \
 src/Makevars.in > src/Makevars
 sed -e "s|@GSL_LIBS@|${GSL_LIBS}|" \
 -e "s|@GSL_CFLAGS@|${GSL_CFLAGS}|" \
--e "s|@CC@|${CXX}|" \
+-e "s|@CXX@|${CXX}|" \
+-e "s|@CPP@|${CPP}|" \
 -e "s|@CFLAGS@|${CXXFLAGS}|" \
 -e "s|@CPICFLAGS@|${CXXPICFLAGS}|" \
 src/graphm/Makefile.in > src/graphm/Makefile

src/Makevars.in

@@ -20,7 +20,7 @@ GRAPHM_OBJ_REL = $(addprefix ./graphm/,$(GRAPHM_OBJ) )
 PKG_LIBS = $(LDFLAGS) -L$(LIB_GSL)/lib/x64 -lgsl -lgslcblas $(RCPPGSL_LDFLAGS) $(GSL_LIBS)
 
 SHVER= 1
-CXX = @CC@
+CXX = @CXX@
 
 SOURCES=  graphmatch_rcpp.cpp RcppExports.cpp
 OBJECTS= $(SOURCES:.cpp=.o) RGraphM_init.o $(GRAPHM_OBJ_REL)

src/graphm/Makefile.in

@@ -1,4 +1,4 @@
-THIS_CXX = @CC@
+THIS_CXX = @CXX@
 GRAPHM_CFLAGS = -Wno-deprecated  -fPIC @CPICFLAGS@ @CFLAGS@ @GSL_CFLAGS@/gsl
 #-Wno-unused-but-set-variable  -Wno-long-long -Wno-sign-compare -Wno-deprecated -pedantic -pthread  -O2 -g
 #LDFLAGS= -lgsl -lgslcblas