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 <behlendorf1@llnl.gov>
Closes: #560

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 51a8abd0cd9d6178ca576f25f448b15eca1fe66b..09139d58c40a55fadc27d1aba2ddaa779f5ea03d 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,4 +4,4 @@ SUBDIRS = libspl libavl libefi libshare libunicode
 
 # These four libraries, which are installed as the final build product,
 # incorporate the five convenience libraries given above.
-SUBDIRS += libnvpair libuutil libzpool libzfs
+SUBDIRS += libuutil libnvpair libzpool libzfs

diff --git a/lib/Makefile.in b/lib/Makefile.in
index c33683dc9f7a1cf06c2eda259542e6a13ae787f3..45180aedea0c0df8683a60cb8014a17620608f07 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -322,7 +322,7 @@ udevruledir = @udevruledir@
 
 # These four libraries, which are installed as the final build product,
 # incorporate the five convenience libraries given above.
-SUBDIRS = libspl libavl libefi libshare libunicode libnvpair libuutil \
+SUBDIRS = libspl libavl libefi libshare libunicode libuutil libnvpair \
        libzpool libzfs
 all: all-recursive
 

diff --git a/lib/libnvpair/Makefile.am b/lib/libnvpair/Makefile.am
index b0cf8ad23f3760e08b11bcfd2db443116b02a5a9..467f461a3b5846a75afdfadcaeb522cfcc368e25 100644 (file)
--- a/lib/libnvpair/Makefile.am
+++ b/lib/libnvpair/Makefile.am
@@ -14,6 +14,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 = \

diff --git a/lib/libnvpair/Makefile.in b/lib/libnvpair/Makefile.in
index 8fb993e632a36f5afcb883c95966d71c289e4d53..b2e8e22dc0f20882af84b61029dfb8ba9477c472 100644 (file)
--- 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