1From a6638a007a42917fea4b03e5c30d9b7208c634c4 Mon Sep 17 00:00:00 2001
2From: Peter Marko <peter.marko@siemens.com>
3Date: Thu, 7 Nov 2024 22:04:40 +0100
4Subject: [PATCH] libltdl: remove reference to nonexisting directory
5
6Commit [1] removed directory libltdl/m4 from release tarball by merging
7all those files into libltdl/aclocal.m4, however makefiles still
8reference it causing following error in do_configure:
9
10| autoreconf: Entering directory 'libltdl'
11| autoreconf: configure.ac: not using Gettext
12| autoreconf: running: aclocal --system-acdir=WORKDIR/recipe-sysroot/usr/share/aclocal/ -I WORKDIR/squid-6.12/acinclude/ -I WORKDIR/recipe-sysroot-native/usr/share/aclocal/ --force -I m4
13| aclocal: error: couldn't open directory 'm4': No such file or directory
14| autoreconf: error: aclocal failed with exit status: 1
15
16Remove these invalid references.
17
18[1] https://github.com/squid-cache/squid/commit/b4addc2262e5bee37543f8d1ab9dd98337bafba3
19
20Signed-off-by: Peter Marko <peter.marko@siemens.com>
21Upstream-Status: Inappropriate [upstream ticket https://lists.squid-cache.org/pipermail/squid-users/2024-November/027244.html]
22---
23 libltdl/Makefile.am | 2 +-
24 libltdl/Makefile.in | 2 +-
25 2 files changed, 2 insertions(+), 2 deletions(-)
26
27diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
28index aad98e2..8a9539b 100644
29--- a/libltdl/Makefile.am
30+++ b/libltdl/Makefile.am
31@@ -29,7 +29,7 @@
32 ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
33 #####
34
35-ACLOCAL_AMFLAGS = -I m4
36+ACLOCAL_AMFLAGS =
37 AUTOMAKE_OPTIONS = foreign
38 AM_CPPFLAGS =
39 AM_LDFLAGS =
40diff --git a/libltdl/Makefile.in b/libltdl/Makefile.in
41index 9929557..c77df2e 100644
42--- a/libltdl/Makefile.in
43+++ b/libltdl/Makefile.in
44@@ -448,7 +448,7 @@ target_alias = @target_alias@
45 top_build_prefix = @top_build_prefix@
46 top_builddir = @top_builddir@
47 top_srcdir = @top_srcdir@
48-ACLOCAL_AMFLAGS = -I m4
49+ACLOCAL_AMFLAGS =
50 AUTOMAKE_OPTIONS = foreign
51
52 # -I$(srcdir) is needed for user that built libltdl with a sub-Automake
53--
542.30.2
55
56