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

- simdzone-zone-load, fix ci with automakedir for windows and aclocal for bsd.
---

diff --git a/.github/workflows/analysis_ports.yml b/.github/workflows/analysis_ports.yml
index e6537c5b9..da7f47431 100644
--- a/.github/workflows/analysis_ports.yml
+++ b/.github/workflows/analysis_ports.yml
@@ -253,10 +253,10 @@ 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 '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 --automake-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
+          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 -I /c/msys64/usr/share/aclocal-1.16
           echo "./configure --enable-debug --enable-static-exe --disable-flto \"--with-ssl=$prepath/openssl\" --with-libexpat=\"$prepath/expat\" --disable-shared"
           ./configure --enable-debug --enable-static-exe --disable-flto "--with-ssl=$prepath/openssl" --with-libexpat="$prepath/expat" --disable-shared
           make
@@ -377,6 +377,7 @@ jobs:
             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"
             rm -f aclocal.m4
+            aclocal
             autoreconf -fi
             #libtoolize -c -i || glibtoolize -c -i
             #(cd simdzone; libtoolize -c -i || glibtoolize -c -i)