From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 16 Oct 2025 14:06:31 +0000 (+0200)
Subject: - simdzone-zone-load, fix ci, aclocal for windows, rm import file for bsd.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d9cc00f0a838971b0ec2e2dc963b9cd34850248;p=thirdparty%2Funbound.git

- simdzone-zone-load, fix ci, aclocal for windows, rm import file for bsd.
---

diff --git a/.github/workflows/analysis_ports.yml b/.github/workflows/analysis_ports.yml
index 2960592dd..e6537c5b9 100644
--- a/.github/workflows/analysis_ports.yml
+++ b/.github/workflows/analysis_ports.yml
@@ -253,6 +253,8 @@ jobs:
           cd ..
           echo "unbound"
           cd unbound
+          echo 'aclocal'
+          PERL5LIB="/c/msys64/usr/share/autoconf-2.71:/c/msys64/usr/share/autoconf:/c/msys64/usr/share/automake-1.16:/c/msys64/usr/share/automake" PERL="C:/msys64/usr/bin/perl" PATH="/c/msys64/usr/bin:$PATH" aclocal-1.16 --system-acdir=/c/msys64/usr/share/aclocal-1.16
           echo 'autoreconf -fi'
           PERL5LIB="/c/msys64/usr/share/autoconf-2.71:/c/msys64/usr/share/autoconf:/c/msys64/usr/share/automake-1.16:/c/msys64/usr/share/automake" PERL="C:/msys64/usr/bin/perl" PATH="/c/msys64/usr/bin:$PATH" autoreconf -fi
           echo "./configure --enable-debug --enable-static-exe --disable-flto \"--with-ssl=$prepath/openssl\" --with-libexpat=\"$prepath/expat\" --disable-shared"
@@ -374,17 +376,14 @@ jobs:
             if test "$CROSS_PLATFORM_OS" = "openbsd"; then sudo pkg_add autoconf-2.71 automake-1.16.5 libtool libevent; export AUTOCONF_VERSION="2.71"; export AUTOMAKE_VERSION="1.16"; fi
             if test "$CROSS_PLATFORM_OS" = "netbsd"; then sudo pkgin -y install autoconf automake libtool libevent; export LDFLAGS="-Wl,--rpath=/usr/pkg/lib"; fi
             echo "::group::configure"
-            autoconf && autoheader
-            (cd simdzone && autoconf && autoheader)
-            aclocal
-            (cd simdzone; aclocal)
-            libtoolize -c -i || glibtoolize -c -i
-            (cd simdzone; libtoolize -c -i || glibtoolize -c -i)
-            # run autoconf again.
-            aclocal
-            (cd simdzone; aclocal)
-            autoconf && autoheader
-            (cd simdzone && autoconf && autoheader)
+            rm -f aclocal.m4
+            autoreconf -fi
+            #libtoolize -c -i || glibtoolize -c -i
+            #(cd simdzone; libtoolize -c -i || glibtoolize -c -i)
+            #aclocal
+            #(cd simdzone; aclocal)
+            #autoconf && autoheader
+            #(cd simdzone && autoconf && autoheader)
             ./configure ${{ matrix.cross_platform_config }}
             echo "::endgroup::"
             echo "::group::make"