1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
From: Boyuan Yang <byang@debian.org>
Date: Sat, 27 Jul 2024 09:03:49 -0400
Subject: Always use config dir for m4 macros
This workarounds the FTBFS due to not finding local m4 macros,
such as AX_INFO_TITLE.
Forwarded: not-needed
---
Makefile.am | 2 +-
Makefile.in | 2 +-
configure.ac | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index d013f2a..4823fad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
# Copyright (C) Tildeslash Ltd. All rights reserved.
AUTOMAKE_OPTIONS = foreign no-dependencies subdir-objects
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I config
SUBDIRS = . $(UNIT_TEST)
DIST_SUBDIRS = . test
diff --git a/Makefile.in b/Makefile.in
index f2177c5..200df1b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -477,7 +477,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies subdir-objects
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I config
SUBDIRS = . $(UNIT_TEST)
DIST_SUBDIRS = . test
EXTRA_DIST = README AUTHORS CHANGES COPYING bootstrap doc test src tools config
diff --git a/configure.ac b/configure.ac
index a726a32..b8f1013 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,8 +6,8 @@ AC_INIT([libzdb], [3.3.0], [bugs-libzdb@tildeslash.com])
AC_SUBST([VERSION_MAJOR], [`echo $PACKAGE_VERSION | cut -d. -f1`])
AC_SUBST([VERSION_MINOR], [`echo $PACKAGE_VERSION | cut -d. -f2`])
AC_SUBST([VERSION_REVISION], [`echo $PACKAGE_VERSION | cut -d. -f3`])
-AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([config])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([src/Config.h])
AC_CONFIG_COMMANDS([libtool_patch],[test `uname` = "OpenBSD" && perl -p -i -e "s/deplibs_check_method=.*/deplibs_check_method=pass_all/g" libtool])
|
