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
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
https://bugs.gentoo.org/731162
From 2abd5015bf6bac1697ac4422d76fa121a49f2b24 Mon Sep 17 00:00:00 2001
From: orbea <orbea@riseup.net>
Date: Fri, 17 Jun 2022 12:36:01 -0700
Subject: [PATCH] configure: Add missing LT_INIT
Otherwise it fails to generate libtool for the build breaking the build
when using a different toolchain than the system libtool. It also breaks
the build with rlibtool which depends on the generated libtool to
determine if it should build static or shared libraries.
The existing make and libtool tests were removed as unnecessary and
problematic.
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,9 @@ AC_ARG_ENABLE(shared,
enable_shared=no)
AC_SUBST(enable_shared)
+LT_INIT
+
+AC_PROG_LIBTOOL
AC_PROG_INSTALL
AC_PROG_CC
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -39,6 +39,8 @@ DEBUG = @debug_build@
OPTIMIZER = @opt_build@
MALLOCLIB = @malloc_lib@
+top_builddir = $(TOPDIR)
+
LIBNFS4ACL = $(TOPDIR)/libnfs4acl/libnfs4acl.la
LIBATTR = @libattr@
@@ -68,7 +70,6 @@ AWK = @awk@
SED = @sed@
TAR = @tar@
ZIP = @zip@
-MAKE = @make@
ECHO = @echo@
SORT = @sort@
LN_S = @LN_S@
--- a/m4/package_utilies.m4
+++ b/m4/package_utilies.m4
@@ -22,26 +22,6 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
AC_SUBST(cc)
AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])
- if test -z "$MAKE"; then
- AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/freeware/bin)
- fi
- if test -z "$MAKE"; then
- AC_PATH_PROG(MAKE, make,, /usr/bin)
- fi
- make=$MAKE
- AC_SUBST(make)
- AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make])
-
- if test -z "$LIBTOOL"; then
- AC_PATH_PROG(LIBTOOL, glibtool,, /usr/bin)
- fi
- if test -z "$LIBTOOL"; then
- AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
- fi
- libtool=$LIBTOOL
- AC_SUBST(libtool)
- AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool])
-
if test -z "$TAR"; then
AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin)
fi
|
