From 3483b67dae85ac1f039613866c56b51f634faeb7 Mon Sep 17 00:00:00 2001 From: Darik Horn Date: Sat, 4 Feb 2012 20:54:43 -0600 Subject: [PATCH] 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. Closes: #560 --- lib/Makefile.am | 2 +- lib/libnvpair/Makefile.am | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index 51a8abd..09139d5 100644 --- 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/libnvpair/Makefile.am b/lib/libnvpair/Makefile.am index b0cf8ad..467f461 100644 --- 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 = \ -- 1.7.5.4