diff --git a/DESCRIPTION b/DESCRIPTION index ab4606a..012a5e0 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: apcf Title: Adapted Pair Correlation Function -Version: 0.3.0 +Version: 0.3.0.900 Authors@R: person(given="Robert", family="Nuske", role=c("aut", "cre"), email="robert.nuske@mailbox.org", @@ -20,7 +20,7 @@ Depends: R (>= 3.3.0) Imports: Rcpp (>= 0.12), wk (>= 0.6.0) Suggests: knitr, rmarkdown LinkingTo: Rcpp -SystemRequirements: C++11, GEOS (>= 3.4.0) +SystemRequirements: GEOS (>= 3.4.0) VignetteBuilder: knitr LazyData: true Roxygen: list(markdown=TRUE) diff --git a/NEWS.md b/NEWS.md index 9f38465..8801758 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,6 @@ +# apcf 0.3.1 +* dropped C++11 as a system requirement + # apcf 0.3.0 * switched to R's random number generator in C++ code * fixed CRANs M1mac vsnprintf() warning diff --git a/configure b/configure index 7ece6d2..b367801 100755 --- a/configure +++ b/configure @@ -2005,25 +2005,17 @@ RVER_MINOR=`echo ${RVER} | cut -f2 -d"."` RVER_PATCH=`echo ${RVER} | cut -f3 -d"."` if test $RVER_MAJOR = "development"; then - CXX11=`"${RBIN}" CMD config CXX11` - CXX11STD=`"${RBIN}" CMD config CXX11STD` + CXX=`"${RBIN}" CMD config CXX` else if test $RVER_MAJOR -lt 3 -o $RVER_MAJOR -eq 3 -a $RVER_MINOR -lt 3; then as_fn_error $? "apcf is not compatible with R versions before 3.3.0" "$LINENO" 5 else - if test $RVER_MAJOR -eq 3 -a $RVER_MINOR -eq 3; then - CXX11=`"${RBIN}" CMD config CXX1X` - CXX11STD=`"${RBIN}" CMD config CXX1XSTD` - else - CXX11=`"${RBIN}" CMD config CXX11` - CXX11STD=`"${RBIN}" CMD config CXX11STD` - fi + CXX=`"${RBIN}" CMD config CXX` fi fi # pick all flags for testing from R : ${CC=`"${RBIN}" CMD config CC`} -: ${CXX=${CXX11} ${CXX11STD}} : ${CFLAGS=`"${RBIN}" CMD config CFLAGS`} : ${CPPFLAGS=`"${RBIN}" CMD config CPPFLAGS`} : ${CXXFLAGS=`"${RBIN}" CMD config CXXFLAGS`} diff --git a/configure.ac b/configure.ac index 4a5dd83..30f2fe2 100644 --- a/configure.ac +++ b/configure.ac @@ -24,25 +24,17 @@ RVER_MINOR=`echo ${RVER} | cut -f2 -d"."` RVER_PATCH=`echo ${RVER} | cut -f3 -d"."` if test [$RVER_MAJOR = "development"]; then - CXX11=`"${RBIN}" CMD config CXX11` - CXX11STD=`"${RBIN}" CMD config CXX11STD` + CXX=`"${RBIN}" CMD config CXX` else if test [$RVER_MAJOR -lt 3] -o [$RVER_MAJOR -eq 3 -a $RVER_MINOR -lt 3]; then AC_MSG_ERROR([apcf is not compatible with R versions before 3.3.0]) else - if test [$RVER_MAJOR -eq 3 -a $RVER_MINOR -eq 3]; then - CXX11=`"${RBIN}" CMD config CXX1X` - CXX11STD=`"${RBIN}" CMD config CXX1XSTD` - else - CXX11=`"${RBIN}" CMD config CXX11` - CXX11STD=`"${RBIN}" CMD config CXX11STD` - fi + CXX=`"${RBIN}" CMD config CXX` fi fi # pick all flags for testing from R : ${CC=`"${RBIN}" CMD config CC`} -: ${CXX=${CXX11} ${CXX11STD}} : ${CFLAGS=`"${RBIN}" CMD config CFLAGS`} : ${CPPFLAGS=`"${RBIN}" CMD config CPPFLAGS`} : ${CXXFLAGS=`"${RBIN}" CMD config CXXFLAGS`} diff --git a/src/Makevars.in b/src/Makevars.in index 1107987..d4e1c72 100644 --- a/src/Makevars.in +++ b/src/Makevars.in @@ -1,3 +1,3 @@ PKG_CPPFLAGS=@PKG_CPPFLAGS@ PKG_LIBS=@PKG_LIBS@ -CXX_STD=CXX11 +CXX_STD=CXX diff --git a/src/Makevars.win b/src/Makevars.win index 62eedfd..2457058 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -12,7 +12,7 @@ PKG_LIBS = \ all: clean winlibs -CXX_STD = CXX11 +CXX_STD = CXX winlibs: mkdir -p ../inst