Ensure autoreconf from non-builder tarballs yield "unknown" as version

diff --git a/Makefile.am b/Makefile.am
index 9a2942c458a5331ef02c652f8943818afd1ccae9..e26c915213ad876fc7da89ea10655f337abf0a9f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,8 @@ EXTRA_DIST = \
        codedocs/doxygen.conf \
        contrib/powerdns.solaris.init.d \
        pdns/named.conf.parsertest \
-       regression-tests/zones/unit.test
+       regression-tests/zones/unit.test \
+       builder-support/gen-version
 
 ACLOCAL_AMFLAGS = -I m4
 

diff --git a/builder-support/dockerfiles/Dockerfile.authoritative b/builder-support/dockerfiles/Dockerfile.authoritative
index 60ac71baa79e3fbe2b87fade521556cde3a4a039..d202333fde6a1b2800553eb06d78eab3064ffa90 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.authoritative
+++ b/builder-support/dockerfiles/Dockerfile.authoritative
@@ -9,6 +9,7 @@ ADD configure.ac Makefile.am COPYING INSTALL NOTICE README /pdns-authoritative/
 @EXEC sdist_dirs=(build-aux m4 pdns ext docs modules codedocs contrib regression-tests)
 @EXEC for d in ${sdist_dirs[@]} ; do echo "COPY $d/ /pdns-authoritative/$d/" ; done
 ADD builder/helpers/set-configure-ac-version.sh /pdns-authoritative/builder/helpers/
+ADD builder-support/gen-version /pdns-authoritative/builder-support/gen-version
 WORKDIR /pdns-authoritative/
 
 RUN mkdir /sdist

diff --git a/builder-support/dockerfiles/Dockerfile.dnsdist b/builder-support/dockerfiles/Dockerfile.dnsdist
index fb886a4753ff64994426bc4b0964811005fdb096..c760229a06125052e3db81feafd29c6cd79ac2a1 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.dnsdist
+++ b/builder-support/dockerfiles/Dockerfile.dnsdist
@@ -6,6 +6,7 @@ RUN apk add --no-cache gcc g++ make tar autoconf automake protobuf-dev lua-dev \
 ADD builder/helpers/set-configure-ac-version.sh /dnsdist/builder/helpers/
 @EXEC sdist_dirs=(build-aux m4 pdns ext)
 @EXEC for d in ${sdist_dirs[@]} ; do echo "COPY $d/ /dnsdist/$d/" ; done
+ADD builder-support/gen-version /dnsdist/pdns/dnsdistdist/builder-support/gen-version
 WORKDIR /dnsdist/pdns/dnsdistdist
 
 RUN mkdir /sdist

diff --git a/builder-support/dockerfiles/Dockerfile.recursor b/builder-support/dockerfiles/Dockerfile.recursor
index b214140679a478febe626457fd492a9c475f44b6..96dc73f87a41915cd7362c2550bf5ffabc3bb84b 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.recursor
+++ b/builder-support/dockerfiles/Dockerfile.recursor
@@ -7,6 +7,7 @@ RUN apk add --no-cache gcc g++ make tar autoconf automake protobuf-dev lua-dev \
 @EXEC sdist_dirs=(build-aux m4 pdns ext docs)
 @EXEC for d in ${sdist_dirs[@]} ; do echo "COPY $d/ /pdns-recursor/$d/" ; done
 ADD builder/helpers/set-configure-ac-version.sh /pdns-recursor/builder/helpers/
+ADD builder-support/gen-version /pdns-recursor/pdns/recursordist/builder-support/gen-version
 WORKDIR /pdns-recursor/pdns/recursordist
 
 RUN mkdir /sdist

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index 9eda0d5017049954eaef3334e2a623b4945d6462..b6e1d39eea9b5e4a31ae7de0345410c9b602b0e9 100644 (file)
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -64,7 +64,8 @@ EXTRA_DIST=dnslabeltext.rl \
           devpollmplexer.cc \
           epollmplexer.cc \
           kqueuemplexer.cc \
-          portsmplexer.cc
+          portsmplexer.cc \
+          builder-support/gen-version
 
 bin_PROGRAMS = dnsdist
 

diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index 06e402a202ad24b25fcdab1bf0f29a87c36c31f0..36658cb156a154c254141ed6e65212f9828780f5 100644 (file)
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -61,7 +61,8 @@ EXTRA_DIST = \
        html incfiles \
        test_libcrypto \
        pdns-recursor.service.in \
-       RECURSOR-MIB.txt
+       RECURSOR-MIB.txt \
+       builder-support/gen-version
 
 dist-hook:
        for file in $$(find $(distdir)/docs -type l); do \