Regenerate configure and config.h.in with Autoconf 2.69.

To that end, add a B-D on autoconf2.69.

diff --git a/debian/changelog b/debian/changelog
index d39b200a371172c99b589cd1544fa832f4789f18..c308f61dc007b00693103a194facdfe9be4364d5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ ncbi-blast+ (2.15.0+ds-1) UNRELEASED; urgency=medium
 
   * New upstream release, which should be (more than) new enough for
     recent q2-feature-classifier.  (Closes: #1074316.)  (NOT RELEASED YET.)
-  * debian/control: Build against libnghttp2-dev, libsqlite3-dev, and
-    libuv1-dev, newly needed.
+  * debian/control:
+    - Build against libnghttp2-dev, libsqlite3-dev, and libuv1-dev, newly
+      needed.
+    - Build against autoconf2.69.
   * debian/patches: Update for new release, mostly formally.
   * debian/patches/series: Move system_mbedtls_only up in conjunction with
     incorporating part of an upstream patch needed by support_mbedtls3.
@@ -13,6 +15,7 @@ ncbi-blast+ (2.15.0+ds-1) UNRELEASED; urgency=medium
     https://github.com/ncbi/ncbi-cxx-toolkit-public/commit/f9c7297dd1)
     and Makefile.xxconnect2.lib.
   * debian/rules:
+    - Regenerate configure and config.h.in with Autoconf 2.69.
     - Extend generated-sources cleanup to objtools/eutils (not entirely
       straightforward due to input format variation).
     - Tune flags: Add --without-strip to make --with-symbols effective;

diff --git a/debian/control b/debian/control
index b14366eb28c84cfff3c51e0d747c1f4a9ba656e5..77bf12ddf5798c389339528512056a88a4c61d9f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,8 @@ Uploaders: Olivier Sallou <osallou@debian.org>,
            Aaron M. Ucko <ucko@debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper-compat (= 13)
+Build-Depends: debhelper-compat (= 13),
+               autoconf2.69
 Build-Depends-Arch: 2to3,
                     libboost-test-dev,
                     libbz2-dev,

diff --git a/debian/rules b/debian/rules
index 65213ec03bb05e68c36136712e6e32cfd9b751b9..9093c1ce4238879ac2444a25a844ee273b452bb3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -59,6 +59,11 @@ $(PREBUILT_DATATOOL_EXE):
            datatool.exe
 endif
 
+override_dh_autoreconf:
+       cd c++  && \
+           autoheader2.69 -Isrc/build-system src/build-system/configure.ac \
+           &&  cd src/build-system  &&  autoconf2.69
+
 override_dh_auto_configure-indep:;
 override_dh_auto_configure-arch: $(PREBUILT_DATATOOL_EXE)
        mkdir -p $(HOME)
@@ -165,4 +170,4 @@ override_dh_clean:
        mv c++/src/util/lmdbxx/lmdb++.h.orig.save c++/src/util/lmdbxx/lmdb++.h.orig
 
 %:
-       dh $@ --sourcedirectory=c++
+       dh $@ --sourcedirectory=c++ --with-autoreconf