From b13de688ba90a18cb5c4d69a4f7d8a317a234e1b Mon Sep 17 00:00:00 2001
From: nocci <dev@sky-net.it>
Date: Fri, 12 Dec 2025 11:43:25 +0000
Subject: [PATCH] Use autoreconf for exchange/merchant tarballs; add autoconf

---
 Dockerfile | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1c90e9e..30c2019 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ ARG MERCHANT_TARBALL_URL=
 ARG LIBEUFIN_TARBALL_URL=
 
 RUN apt-get update && apt-get install -y \
-    build-essential git automake libtool pkg-config \
+    build-essential git automake autoconf libtool pkg-config \
     libgnutls28-dev libjansson-dev libsqlite3-dev libunistring-dev \
     libcurl4-openssl-dev libmicrohttpd-dev libgcrypt20-dev libsodium-dev \
     postgresql-client curl gnupg gettext gettext-base \
@@ -88,13 +88,14 @@ RUN set -e; \
       git clone --depth 1 --branch "${EXCHANGE_REF}" https://git.taler.net/exchange.git /src/exchange; \
       EXCHANGE_DIR="/src/exchange"; \
     fi; \
-    if [ ! -f "${EXCHANGE_DIR}/configure" ]; then \
-      if [ ! -d "${EXCHANGE_DIR}/.git" ]; then \
-        (cd "${EXCHANGE_DIR}" && git init >/dev/null 2>&1); \
-      fi; \
-      cd "${EXCHANGE_DIR}" && env GNUNET_PREFIX=/usr GIT_CONFIG_NOSYSTEM=1 GIT_DIR= GIT_WORK_TREE=. ./bootstrap; \
+    if [ "${EXCHANGE_TAR}" = "1" ]; then \
+      cd "${EXCHANGE_DIR}" && autoreconf -fi; \
     else \
-      echo "Skipping bootstrap for Exchange (configure present)"; \
+      if [ ! -f "${EXCHANGE_DIR}/configure" ]; then \
+        cd "${EXCHANGE_DIR}" && env GNUNET_PREFIX=/usr ./bootstrap; \
+      else \
+        echo "Skipping bootstrap for Exchange (configure present)"; \
+      fi; \
     fi; \
     cd "${EXCHANGE_DIR}" && env GNUNET_PREFIX=/usr GIT_CONFIG_NOSYSTEM=1 GIT_DIR= GIT_WORK_TREE=. ./configure --prefix=/usr && make -j$(nproc) && make install; \
     # Merchant
@@ -118,13 +119,14 @@ RUN set -e; \
       git clone --depth 1 --branch "${MERCHANT_REF}" https://git.taler.net/merchant.git /src/merchant; \
       MERCHANT_DIR="/src/merchant"; \
     fi; \
-    if [ ! -f "${MERCHANT_DIR}/configure" ]; then \
-      if [ ! -d "${MERCHANT_DIR}/.git" ]; then \
-        (cd "${MERCHANT_DIR}" && git init >/dev/null 2>&1); \
-      fi; \
-      cd "${MERCHANT_DIR}" && env GNUNET_PREFIX=/usr GIT_CONFIG_NOSYSTEM=1 GIT_DIR= GIT_WORK_TREE=. ./bootstrap; \
+    if [ "${MERCHANT_TAR}" = "1" ]; then \
+      cd "${MERCHANT_DIR}" && autoreconf -fi; \
     else \
-      echo "Skipping bootstrap for Merchant (configure present)"; \
+      if [ ! -f "${MERCHANT_DIR}/configure" ]; then \
+        cd "${MERCHANT_DIR}" && env GNUNET_PREFIX=/usr ./bootstrap; \
+      else \
+        echo "Skipping bootstrap for Merchant (configure present)"; \
+      fi; \
     fi; \
     cd "${MERCHANT_DIR}" && env GNUNET_PREFIX=/usr GIT_CONFIG_NOSYSTEM=1 GIT_DIR= GIT_WORK_TREE=. ./configure --prefix=/usr && make -j$(nproc) && make install