For tarball builds, use existing configure or autoreconf if missing

This commit is contained in:
nocci 2025-12-12 11:48:17 +00:00
parent b13de688ba
commit db6ccd4dcb

View file

@ -89,7 +89,11 @@ RUN set -e; \
EXCHANGE_DIR="/src/exchange"; \ EXCHANGE_DIR="/src/exchange"; \
fi; \ fi; \
if [ "${EXCHANGE_TAR}" = "1" ]; then \ if [ "${EXCHANGE_TAR}" = "1" ]; then \
if [ -f "${EXCHANGE_DIR}/configure" ]; then \
echo "Using existing configure for Exchange tarball"; \
else \
cd "${EXCHANGE_DIR}" && autoreconf -fi; \ cd "${EXCHANGE_DIR}" && autoreconf -fi; \
fi; \
else \ else \
if [ ! -f "${EXCHANGE_DIR}/configure" ]; then \ if [ ! -f "${EXCHANGE_DIR}/configure" ]; then \
cd "${EXCHANGE_DIR}" && env GNUNET_PREFIX=/usr ./bootstrap; \ cd "${EXCHANGE_DIR}" && env GNUNET_PREFIX=/usr ./bootstrap; \
@ -120,7 +124,11 @@ RUN set -e; \
MERCHANT_DIR="/src/merchant"; \ MERCHANT_DIR="/src/merchant"; \
fi; \ fi; \
if [ "${MERCHANT_TAR}" = "1" ]; then \ if [ "${MERCHANT_TAR}" = "1" ]; then \
if [ -f "${MERCHANT_DIR}/configure" ]; then \
echo "Using existing configure for Merchant tarball"; \
else \
cd "${MERCHANT_DIR}" && autoreconf -fi; \ cd "${MERCHANT_DIR}" && autoreconf -fi; \
fi; \
else \ else \
if [ ! -f "${MERCHANT_DIR}/configure" ]; then \ if [ ! -f "${MERCHANT_DIR}/configure" ]; then \
cd "${MERCHANT_DIR}" && env GNUNET_PREFIX=/usr ./bootstrap; \ cd "${MERCHANT_DIR}" && env GNUNET_PREFIX=/usr ./bootstrap; \