From e67329d8e0befe79016bd3e4d52435552c554a52 Mon Sep 17 00:00:00 2001 From: Darik Horn Date: Sat, 4 Feb 2012 20:54:43 -0600 Subject: Let libnvpair be linked independently of libzfs. Autoconf will fail to detect the ZoL libnvpair on systems that do not implicitly link library runtime dependencies, which is anything that has the GCC 4.5 DCO update. Build libuutil before libnvpair, and put it on the the LDADD line of the libnvpair automake template. Signed-off-by: Brian Behlendorf Closes: #560 --- lib/libnvpair/Makefile.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/libnvpair/Makefile.in') diff --git a/lib/libnvpair/Makefile.in b/lib/libnvpair/Makefile.in index 8fb993e63..b2e8e22dc 100644 --- a/lib/libnvpair/Makefile.in +++ b/lib/libnvpair/Makefile.in @@ -116,7 +116,7 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) -libnvpair_la_LIBADD = +libnvpair_la_DEPENDENCIES = $(top_builddir)/lib/libuutil/libuutil.la am_libnvpair_la_OBJECTS = libnvpair.lo nvpair_alloc_system.lo \ nvpair_alloc_fixed.lo nvpair.lo libnvpair_la_OBJECTS = $(am_libnvpair_la_OBJECTS) @@ -348,6 +348,9 @@ libnvpair_la_SOURCES = \ $(top_srcdir)/module/nvpair/nvpair_alloc_fixed.c \ $(top_srcdir)/module/nvpair/nvpair.c +libnvpair_la_LIBADD = \ + $(top_builddir)/lib/libuutil/libuutil.la + libnvpair_la_LDFLAGS = -version-info 1:1:0 EXTRA_DIST = \ $(top_srcdir)/module/nvpair/nvpair_alloc_spl.c -- cgit v1.2.3