add geos-config --libs; #844

Author: edzer

configure

@@ -3983,7 +3983,7 @@ fi
 $as_echo_n "checking geos-config usability... " >&6; }
 if test `${GEOS_CONFIG} --version`
 then
-  GEOS_CLIBS=`${GEOS_CONFIG} --clibs`
+  GEOS_CLIBS="`${GEOS_CONFIG} --libs` `${GEOS_CONFIG} --clibs`"
   #GEOS_DEP_CLIBS=`geos-config --static-clibs` -- this gives -m instead of -lm, which breaks clang
   # fixed in 3.7.0 at https://github.com/libgeos/libgeos/pull/73#issuecomment-262208677
   GEOS_DEP_CLIBS=`${GEOS_CONFIG} --static-clibs | sed 's/-m/-lm/g'`

configure.ac

@@ -520,7 +520,7 @@ fi
 AC_MSG_CHECKING(geos-config usability)
 if test `${GEOS_CONFIG} --version`
 then
-  GEOS_CLIBS=`${GEOS_CONFIG} --clibs`
+  GEOS_CLIBS="`${GEOS_CONFIG} --libs` `${GEOS_CONFIG} --clibs`"
   #GEOS_DEP_CLIBS=`geos-config --static-clibs` -- this gives -m instead of -lm, which breaks clang
   # fixed in 3.7.0 at https://github.com/libgeos/libgeos/pull/73#issuecomment-262208677
   GEOS_DEP_CLIBS=`${GEOS_CONFIG} --static-clibs | sed 's/-m/-lm/g'`

inst/docker/gdal230/Dockerfile

@@ -121,11 +121,18 @@ RUN R CMD INSTALL rgdal_*.tar.gz
 
 RUN git   clone https://github.com/r-spatial/sf.git
 RUN R CMD build --no-build-vignettes --no-manual sf
-RUN R CMD INSTALL sf_*gz
+RUN ldconfig
 
-RUN Rscript -e 'install.packages(c("lwgeom", "tmap", "pool", "odbc", "mapview"), repos = "https://cloud.r-project.org")'
+RUN svn checkout svn://svn.r-forge.r-project.org/svnroot/rgeos/
+RUN R CMD build rgeos/pkg --no-build-vignettes
+RUN R CMD INSTALL rgeos_*tar.gz
+RUN geos-config --libs
 
-RUN R CMD check --no-build-vignettes --no-manual --as-cran --run-dontrun sf_*tar.gz
+#RUN R CMD INSTALL sf_*gz
+
+#RUN Rscript -e 'install.packages(c("lwgeom", "tmap", "pool", "odbc", "mapview"), repos = "https://cloud.r-project.org")'
+
+#RUN R CMD check --no-build-vignettes --no-manual --as-cran --run-dontrun sf_*tar.gz
 #RUN R CMD check --no-build-vignettes --no-manual --as-cran sf_*tar.gz
 #RUN R CMD check --no-build-vignettes --no-manual sf_*tar.gz