diff options
| author | Arvind Sankar <[email protected]> | 2020-07-05 21:08:40 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2020-07-10 14:26:12 -0700 |
| commit | 1537105a8cfecb227a2925a7889cd662224b7968 (patch) | |
| tree | 0fe488b7e9bba4512318e1e7f54f17c54e045d85 /cmd | |
| parent | 4d61ade1a317606dc899e38b516410a0c2fdae0e (diff) | |
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 <[email protected]>
Signed-off-by: Arvind Sankar <[email protected]>
Closes #10538
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/mount_zfs/Makefile.am | 2 | ||||
| -rw-r--r-- | cmd/zfs/Makefile.am | 4 | ||||
| -rw-r--r-- | cmd/zpool/Makefile.am | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/cmd/mount_zfs/Makefile.am b/cmd/mount_zfs/Makefile.am index 616ee65a7..ed3208a9a 100644 --- a/cmd/mount_zfs/Makefile.am +++ b/cmd/mount_zfs/Makefile.am @@ -16,3 +16,5 @@ mount_zfs_LDADD = \ $(top_builddir)/lib/libzfs/libzfs.la \ $(top_builddir)/lib/libzfs_core/libzfs_core.la \ $(top_builddir)/lib/libnvpair/libnvpair.la + +mount_zfs_LDADD += $(LTLIBINTL) diff --git a/cmd/zfs/Makefile.am b/cmd/zfs/Makefile.am index 1ce721a8b..5c73477d2 100644 --- a/cmd/zfs/Makefile.am +++ b/cmd/zfs/Makefile.am @@ -16,6 +16,8 @@ zfs_LDADD = \ $(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libuutil/libuutil.la +zfs_LDADD += $(LTLIBINTL) + if BUILD_FREEBSD -zfs_LDADD += -L/usr/local/lib -lintl -lgeom -ljail +zfs_LDADD += -lgeom -ljail endif 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) |