use PIC flags associated w/R configuration

Author: kevinushey

configure

@@ -643,7 +643,11 @@ PACKAGE_URL=''
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-R_CXX11_PREFIX
+STDVER
+CXX11PICFLAGS
+CXX11STD
+CXX11
+CC
 target_alias
 host_alias
 build_alias
@@ -1734,15 +1738,40 @@ as_arg_v2="3.4.0"
 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
 case $? in #(
   1) :
-    R_CXX11_PREFIX="CXX1X" ;; #(
+    USE_CXX11="no" ;; #(
   0) :
-    R_CXX11_PREFIX="CXX11" ;; #(
+    USE_CXX11="yes" ;; #(
   2) :
-    R_CXX11_PREFIX="CXX11" ;; #(
+    USE_CXX11="yes" ;; #(
   *) :
      ;;
 esac
 
+if test "${USE_CXX11}" = "yes"
+then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: R >= 3.4.0 detected" >&5
+$as_echo "$as_me: R >= 3.4.0 detected" >&6;}
+   CC=`"${R_HOME}/bin/R" CMD config CC`
+   CXX11=`"${R_HOME}/bin/R" CMD config CXX11`
+   CXX11STD=`"${R_HOME}/bin/R" CMD config CXX11STD`
+   CXX11PICFLAGS=`"${R_HOME}/bin/R" CMD config CXX11PICFLAGS`
+   STDVER=c++11
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: R < 3.4.0 detected" >&5
+$as_echo "$as_me: R < 3.4.0 detected" >&6;}
+   CC=`"${R_HOME}/bin/R" CMD config CC`
+   CXX11=`"${R_HOME}/bin/R" CMD config CXX1X`
+   CXX11STD=`"${R_HOME}/bin/R" CMD config CXX1XSTD`
+   CXX11PICFLAGS=`"${R_HOME}/bin/R" CMD config CXX1XPICFLAGS`
+   STDVER=c++0x
+fi
+
+
+
+
+
+
+
 ac_config_files="$ac_config_files src/Makevars"
 
 cat >confcache <<\_ACEOF

configure.ac

@@ -7,10 +7,33 @@ fi
 
 R_VERSION=`"${R_HOME}/bin/R" --vanilla --slave -e "cat(as.character(getRversion()))"`
 AS_VERSION_COMPARE("${R_VERSION}", "3.4.0",
-                   [R_CXX11_PREFIX="CXX1X"],
-                   [R_CXX11_PREFIX="CXX11"],
-                   [R_CXX11_PREFIX="CXX11"])
-AC_SUBST(R_CXX11_PREFIX)
+                   [USE_CXX11="no"],
+                   [USE_CXX11="yes"],
+                   [USE_CXX11="yes"])
+
+if test "${USE_CXX11}" = "yes"
+then
+   AC_MSG_NOTICE([R >= 3.4.0 detected])
+   CC=`"${R_HOME}/bin/R" CMD config CC`
+   CXX11=`"${R_HOME}/bin/R" CMD config CXX11`
+   CXX11STD=`"${R_HOME}/bin/R" CMD config CXX11STD`
+   CXX11PICFLAGS=`"${R_HOME}/bin/R" CMD config CXX11PICFLAGS`
+   STDVER=c++11
+else
+   AC_MSG_NOTICE([R < 3.4.0 detected])
+   CC=`"${R_HOME}/bin/R" CMD config CC`
+   CXX11=`"${R_HOME}/bin/R" CMD config CXX1X`
+   CXX11STD=`"${R_HOME}/bin/R" CMD config CXX1XSTD`
+   CXX11PICFLAGS=`"${R_HOME}/bin/R" CMD config CXX1XPICFLAGS`
+   STDVER=c++0x
+fi
+
+AC_SUBST(CC)
+AC_SUBST(CXX11)
+AC_SUBST(CXX11STD)
+AC_SUBST(CXX11PICFLAGS)
+AC_SUBST(STDVER)
+
 AC_CONFIG_FILES([src/Makevars])
 AC_OUTPUT
 

src/Makevars.in

@@ -1,15 +1,16 @@
 # Calls to 'firstword' are used to strip out
 # a possible '-m64' attached to the CC variable
 # (or other compiler arguments)
-PKG_CPPFLAGS += $(@R_CXX11_PREFIX@STD) -I../inst/include/
+PKG_CPPFLAGS += @CXX11STD@ -I../inst/include/
 
 ifeq ($(OS), Windows_NT)
 
   USE_TBB=Windows
   TBB_COPY_PATTERN=tbb*.dll
 
   MAKEFLAGS = -j1
-  MAKE_CMD = CONLY="$(CC)" CPLUS="$(@R_CXX11_PREFIX@)" make
+  MAKE = make -e
+  MAKE_CMD = CONLY="@CC@" CPLUS="@CXX11@" PIC_KEY="@CXX11PICFLAGS@" $(MAKE)
 
 else
 
@@ -28,7 +29,8 @@ else
     endif
   endif
 
-  MAKE_CMD=$(MAKE)
+  MAKE += -e
+  MAKE_CMD = CONLY="@CC@" CPLUS="@CXX11@" PIC_KEY="@CXX11PICFLAGS@" $(MAKE)
 
 endif
 
@@ -74,11 +76,11 @@ tbb:
 	mkdir -p ../inst/lib/$(ARCH_DIR); \
 	cd tbb/src; \
 	if [ -n "$(shell echo $(CC) | grep clang)" ]; then \
-	   $(MAKE_CMD) stdver=c++0x compiler=clang $(MAKE_ARGS); \
+	   $(MAKE_CMD) stdver=@STDVER@ compiler=clang $(MAKE_ARGS); \
 	elif [ -n "$(shell echo $(CC) | grep gcc)" ]; then \
-	   $(MAKE_CMD) stdver=c++0x compiler=gcc $(MAKE_ARGS); \
+	   $(MAKE_CMD) stdver=@STDVER@ compiler=gcc $(MAKE_ARGS); \
 	else \
-	   $(MAKE_CMD) stdver=c++0x $(MAKE_ARGS); \
+	   $(MAKE_CMD) stdver=@STDVER@ $(MAKE_ARGS); \
 	fi; \
 	cd ../..; \
 	cp tbb/build/lib_release/$(TBB_COPY_PATTERN) ../inst/lib/$(ARCH_DIR)