From f36daeac96c30aa5ed42ffa9ccd8cd4366b08b13 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 29 Sep 2023 23:01:30 +0200 Subject: [PATCH] Allow different --libtool options from multiple gnulib-tool invocations. * modules/crypto/gc (Makefile.am): Don't test GL_COND_LIBTOOL, since gnulib-tool already eliminates lib_LDFLAGS augmentations for non-libtool libraries. * modules/striconv (Makefile.am): Likewise. * modules/striconveh (Makefile.am): Likewise. * modules/termcap (Makefile.am): Likewise. * modules/terminfo (Makefile.am): Likewise. --- ChangeLog | 11 +++++++++++ modules/crypto/gc | 2 -- modules/striconv | 2 -- modules/striconveh | 2 -- modules/termcap | 2 -- modules/terminfo | 2 -- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index f536914fb8..3cb1e28640 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2023-09-29 Bruno Haible + + Allow different --libtool options from multiple gnulib-tool invocations. + * modules/crypto/gc (Makefile.am): Don't test GL_COND_LIBTOOL, since + gnulib-tool already eliminates lib_LDFLAGS augmentations for non-libtool + libraries. + * modules/striconv (Makefile.am): Likewise. + * modules/striconveh (Makefile.am): Likewise. + * modules/termcap (Makefile.am): Likewise. + * modules/terminfo (Makefile.am): Likewise. + 2023-09-29 KO Myung-Hun stdlib: Cast putenv() on OS/2 kLIBC diff --git a/modules/crypto/gc b/modules/crypto/gc index cd1d56b5c0..bda331ff3d 100644 --- a/modules/crypto/gc +++ b/modules/crypto/gc @@ -26,9 +26,7 @@ lib_SOURCES += gc-libgcrypt.c else lib_SOURCES += gc-gnulib.c endif -if GL_COND_LIBTOOL lib_LDFLAGS += $(LTLIBGCRYPT) -endif Include: "gc.h" diff --git a/modules/striconv b/modules/striconv index d4677a33cc..542287dcea 100644 --- a/modules/striconv +++ b/modules/striconv @@ -20,9 +20,7 @@ fi Makefile.am: lib_SOURCES += striconv.h striconv.c -if GL_COND_LIBTOOL lib_LDFLAGS += $(LTLIBICONV) -endif Include: "striconv.h" diff --git a/modules/striconveh b/modules/striconveh index 2702cec6c2..7e039ec146 100644 --- a/modules/striconveh +++ b/modules/striconveh @@ -29,9 +29,7 @@ fi Makefile.am: lib_SOURCES += striconveh.h striconveh.c -if GL_COND_LIBTOOL lib_LDFLAGS += $(LTLIBICONV) -endif Include: "striconveh.h" diff --git a/modules/termcap b/modules/termcap index 4f9156c4e6..74b4071478 100644 --- a/modules/termcap +++ b/modules/termcap @@ -23,9 +23,7 @@ configure.ac: gl_TERMCAP Makefile.am: -if GL_COND_LIBTOOL lib_LDFLAGS += $(LTLIBTERMCAP) -endif Include: diff --git a/modules/terminfo b/modules/terminfo index c7b0a8b71f..7d37385a41 100644 --- a/modules/terminfo +++ b/modules/terminfo @@ -16,9 +16,7 @@ configure.ac: gl_TERMINFO Makefile.am: -if GL_COND_LIBTOOL lib_LDFLAGS += $(LTLIBTERMINFO) -endif Include: -- 2.39.5