From 3a79b2b09b1faaa85c41fb5fc9c2730ab9ba44aa Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Sun, 22 Aug 2021 10:41:48 +0200 Subject: [PATCH] Fix gettext (-lintl) linker flags. The external gettext library should be used on main libcryptsetup, not later for programs (these do not call any translations). (Also it was in the wrong order there failing compilation.) --- lib/Makemodule.am | 1 + tests/Makefile.am | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/Makemodule.am b/lib/Makemodule.am index e9b250e7..d890db34 100644 --- a/lib/Makemodule.am +++ b/lib/Makemodule.am @@ -33,6 +33,7 @@ libcryptsetup_la_LIBADD = \ @JSON_C_LIBS@ \ @BLKID_LIBS@ \ $(LTLIBICONV) \ + $(LTLIBINTL) \ libcrypto_backend.la \ libutils_io.la diff --git a/tests/Makefile.am b/tests/Makefile.am index 794a62ea..dc8fa001 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -95,19 +95,17 @@ CLEANFILES = cryptsetup-tst* valglog* *-fail-*.log test-symbols-list.h fake_toke clean-local: -rm -rf tcrypt-images luks1-images luks2-images bitlk-images conversion_imgs luks2_valid_hdr.img blkid-luks2-pv-img blkid-luks2-pv-img.bcp -LDADD = $(LTLIBINTL) - differ_SOURCES = differ.c differ_CFLAGS = $(AM_CFLAGS) -Wall -O2 api_test_SOURCES = api-test.c api_test.h test_utils.c -api_test_LDADD = $(LDADD) ../libcryptsetup.la +api_test_LDADD = ../libcryptsetup.la api_test_LDFLAGS = $(AM_LDFLAGS) -static api_test_CFLAGS = -g -Wall -O0 $(AM_CFLAGS) -I$(top_srcdir)/lib api_test_CPPFLAGS = $(AM_CPPFLAGS) -include config.h api_test_2_SOURCES = api-test-2.c api_test.h test_utils.c -api_test_2_LDADD = $(LDADD) ../libcryptsetup.la +api_test_2_LDADD = ../libcryptsetup.la api_test_2_LDFLAGS = $(AM_LDFLAGS) -static api_test_2_CFLAGS = -g -Wall -O0 $(AM_CFLAGS) -I$(top_srcdir)/lib api_test_2_CPPFLAGS = $(AM_CPPFLAGS) -include config.h