From ce8cbe319f5e0b65ce8b8485be14c46bd8ab40d0 Mon Sep 17 00:00:00 2001
From: nilason <n_larsson@yahoo.com>
Date: Wed, 15 Sep 2021 18:02:08 +0200
Subject: [PATCH] docker: fix configuration errors and warnings after
 autoconf-2.69 update

- Remove single quotes around include directory in configuration
- Remove non-existing configuration options
---
 docker/alpine/Dockerfile | 6 ++----
 docker/debian/Dockerfile | 5 ++---
 docker/ubuntu/Dockerfile | 5 ++---
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile
index 8d1337a8610..e74883a08c1 100644
--- a/docker/alpine/Dockerfile
+++ b/docker/alpine/Dockerfile
@@ -89,17 +89,16 @@ FROM common as build
 ENV GRASS_CONFIG="\
       --enable-largefile \
       --with-cxx \
-      --with-proj --with-proj-share=/usr/share/proj \
+      --with-proj-share=/usr/share/proj \
       --with-gdal \
       --with-pdal \
-      --with-python \
       --with-geos \
       --with-sqlite \
       --with-bzlib \
       --with-zstd \
       --with-cairo --with-cairo-ldflags=-lfontconfig \
       --with-fftw \
-      --with-postgres --with-postgres-includes='/usr/include/postgresql' \
+      --with-postgres --with-postgres-includes=/usr/include/postgresql \
       --without-freetype \
       --without-openmp \
       --without-opengl \
@@ -107,7 +106,6 @@ ENV GRASS_CONFIG="\
       --without-mysql \
       --without-odbc \
       --without-openmp \
-      --without-ffmpeg \
       "
 
 # Set environmental variables for GRASS GIS compilation, without debug symbols
diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile
index d6a8f7e21fd..9c6d55377d1 100644
--- a/docker/debian/Dockerfile
+++ b/docker/debian/Dockerfile
@@ -174,14 +174,14 @@ RUN make distclean || echo "nothing to clean"
 RUN /src/grass_build/configure \
   --with-cxx \
   --enable-largefile \
-  --with-proj --with-proj-share=/usr/share/proj \
+  --with-proj-share=/usr/share/proj \
   --with-gdal=/usr/bin/gdal-config \
   --with-geos \
   --with-sqlite \
   --with-cairo --with-cairo-ldflags=-lfontconfig \
   --with-freetype --with-freetype-includes="/usr/include/freetype2/" \
   --with-fftw \
-  --with-postgres=yes --with-postgres-includes="/usr/include/postgresql" \
+  --with-postgres --with-postgres-includes="/usr/include/postgresql" \
   --with-netcdf \
   --with-zstd \
   --with-bzlib \
@@ -189,7 +189,6 @@ RUN /src/grass_build/configure \
   --without-mysql \
   --without-odbc \
   --without-openmp \
-  --without-ffmpeg \
   --without-opengl \
     && make -j $NUMTHREADS \
     && make install && ldconfig
diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
index 582e7a4b84b..b8cbf3d8e55 100644
--- a/docker/ubuntu/Dockerfile
+++ b/docker/ubuntu/Dockerfile
@@ -166,14 +166,14 @@ RUN make distclean || echo "nothing to clean"
 RUN /src/grass_build/configure \
   --with-cxx \
   --enable-largefile \
-  --with-proj --with-proj-share=/usr/share/proj \
+  --with-proj-share=/usr/share/proj \
   --with-gdal=/usr/bin/gdal-config \
   --with-geos \
   --with-sqlite \
   --with-cairo --with-cairo-ldflags=-lfontconfig \
   --with-freetype --with-freetype-includes="/usr/include/freetype2/" \
   --with-fftw \
-  --with-postgres=yes --with-postgres-includes="/usr/include/postgresql" \
+  --with-postgres --with-postgres-includes="/usr/include/postgresql" \
   --with-netcdf \
   --with-zstd \
   --with-bzlib \
@@ -181,7 +181,6 @@ RUN /src/grass_build/configure \
   --without-mysql \
   --without-odbc \
   --without-openmp \
-  --without-ffmpeg \
   --without-opengl \
     && make -j $NUMTHREADS \
     && make install && ldconfig