This is an automated email from the git hooks/post-receive script.
ildumi pushed a commit to branch development
in repository libtool.
The following commit(s) were added to refs/heads/development by this push:
new e4198afe Apply simpler solution for bug#73672
e4198afe is described below
commit e4198afeebbb75855ad9e06671970b45aa1a3353
Author: Ileana Dumitrescu <ileanadumitresc...@gmail.com>
AuthorDate: Fri Oct 11 16:42:03 2024 +0300
Apply simpler solution for bug#73672
* libltdl/ltdl.mk: Replace conditional with LT_DOLLAR_SIGN for
LT_ARGZ_H_PATH variable.
* m4/ltargz.m4: Add AC_SUBST for LT_ARGZ_H_PATH to set source path
to LT_ARGZ_H file.
* NEWS: Remove additional spacing.
---
NEWS | 2 +-
libltdl/ltdl.mk | 3 +--
m4/ltargz.m4 | 5 ++---
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/NEWS b/NEWS
index d1e1a1a3..c83ad75b 100644
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,7 @@ NEWS - list of user-visible changes between releases of GNU
Libtool
- Fix incorrect use of workarounds designed for Darwin versions that
don't have -single_module support.
-
+
- Fix errors when executing 'make distclean' and 'make maintainer-clean'.
- Fix bug where the constructed rpath omit directories, instead of
diff --git a/libltdl/ltdl.mk b/libltdl/ltdl.mk
index b1ee800f..2e224cbc 100644
--- a/libltdl/ltdl.mk
+++ b/libltdl/ltdl.mk
@@ -131,8 +131,7 @@ EXTRA_DIST += libltdl/COPYING.LIB \
## Gnulib Makefile.am snippets ##
## --------------------------- ##
-# Ugly conditional for 'make maintainer-clean' when LT_ARGZ_H is empty
-BUILT_SOURCES += @LT_DOLLAR_SIGN@(if
@LT_DOLLAR_SIGN@(LT_ARGZ_H),libltdl/libltdl/@LT_DOLLAR_SIGN@(LT_ARGZ_H))
+BUILT_SOURCES += $(LT_ARGZ_H_PATH)
EXTRA_DIST += libltdl/libltdl/lt__argz_.h \
libltdl/lt__argz.c
diff --git a/m4/ltargz.m4 b/m4/ltargz.m4
index 6c24f176..327b0b47 100644
--- a/m4/ltargz.m4
+++ b/m4/ltargz.m4
@@ -71,10 +71,9 @@ AS_IF([test -z "$LT_ARGZ_H"],
[AC_DEFINE([HAVE_WORKING_ARGZ], 1,
[This value is set to 1 to indicate that the system argz
facility works])],
[LT_ARGZ_H=lt__argz.h
+ LT_ARGZ_H_PATH=libltdl/libltdl/$LT_ARGZ_H
AC_LIBOBJ([lt__argz])])])
AC_SUBST([LT_ARGZ_H])
-
-# Avoid non-POSIX variable name
-AC_SUBST([LT_DOLLAR_SIGN],[$])dnl
+AC_SUBST([LT_ARGZ_H_PATH])
])
