From 1537105a8cfecb227a2925a7889cd662224b7968 Mon Sep 17 00:00:00 2001 From: Arvind Sankar Date: Sun, 5 Jul 2020 21:08:40 -0400 Subject: Add config.rpath for AM_GNU_GETTEXT Commit e8864b1b28c2 ("config: libintl/libiconv for gettext() detection") added an empty config.rpath with a comment that the real one doesn't work with libtool. However, an empty config.rpath doesn't really work: eg. on FreeBSD, where libintl is in /usr/local/lib, configure thinks that gettext doesn't exist and NLS should be disabled, which currently isn't supported in the source, and hence requires manual workaround to directly link -lintl without relying on configure. config.rpath is essential to let it be detected either in --prefix or using --with-libintl-prefix. I also don't see the mentioned issue with libtool flags applied to compilation, it seems to work fine to pass LTLIBINTL to libtool. It's unnecessary to include LTLIBICONV as the configure test will automatically append that to LTLIBINTL if it is necessary to link with libiconv. Reviewed-by: Brian Behlendorf Signed-off-by: Arvind Sankar Closes #10538 --- cmd/zpool/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'cmd/zpool/Makefile.am') diff --git a/cmd/zpool/Makefile.am b/cmd/zpool/Makefile.am index 04bdbffcd..cd847a170 100644 --- a/cmd/zpool/Makefile.am +++ b/cmd/zpool/Makefile.am @@ -27,8 +27,10 @@ zpool_LDADD = \ $(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libuutil/libuutil.la +zpool_LDADD += $(LTLIBINTL) + if BUILD_FREEBSD -zpool_LDADD += -L/usr/local/lib -lintl -lgeom +zpool_LDADD += -lgeom endif zpool_LDADD += -lm $(LIBBLKID_LIBS) $(LIBUUID_LIBS) -- cgit v1.2.3