diff options
| -rw-r--r-- | cmd/zdb/Makefile.am | 2 | ||||
| -rw-r--r-- | cmd/zfs/Makefile.am | 1 | ||||
| -rw-r--r-- | cmd/zhack/Makefile.am | 2 | ||||
| -rw-r--r-- | cmd/zstreamdump/Makefile.am | 2 | ||||
| -rw-r--r-- | cmd/ztest/Makefile.am | 2 | ||||
| -rw-r--r-- | config/user-libuuid.m4 | 4 | ||||
| -rw-r--r-- | config/user-zlib.m4 | 6 | ||||
| -rw-r--r-- | lib/libefi/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/libzfs/Makefile.am | 2 |
9 files changed, 8 insertions, 15 deletions
diff --git a/cmd/zdb/Makefile.am b/cmd/zdb/Makefile.am index c22186a10..eb8e6777f 100644 --- a/cmd/zdb/Makefile.am +++ b/cmd/zdb/Makefile.am @@ -18,5 +18,3 @@ zdb_LDADD = \ $(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzfs/libzfs.la \ $(top_builddir)/lib/libzfs_core/libzfs_core.la - -zdb_LDADD += $(ZLIB) diff --git a/cmd/zfs/Makefile.am b/cmd/zfs/Makefile.am index 3cac73da6..e40909516 100644 --- a/cmd/zfs/Makefile.am +++ b/cmd/zfs/Makefile.am @@ -19,5 +19,4 @@ zfs_LDADD = \ $(top_builddir)/lib/libzfs/libzfs.la \ $(top_builddir)/lib/libzfs_core/libzfs_core.la -zfs_LDADD += $(ZLIB) zfs_LDFLAGS = -pthread diff --git a/cmd/zhack/Makefile.am b/cmd/zhack/Makefile.am index 53e324142..a7bce5dde 100644 --- a/cmd/zhack/Makefile.am +++ b/cmd/zhack/Makefile.am @@ -15,5 +15,3 @@ zhack_LDADD = \ $(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzfs/libzfs.la \ $(top_builddir)/lib/libzfs_core/libzfs_core.la - -zhack_LDADD += $(ZLIB) diff --git a/cmd/zstreamdump/Makefile.am b/cmd/zstreamdump/Makefile.am index 654863adb..b46958d65 100644 --- a/cmd/zstreamdump/Makefile.am +++ b/cmd/zstreamdump/Makefile.am @@ -15,5 +15,3 @@ zstreamdump_LDADD = \ $(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzfs/libzfs.la \ $(top_builddir)/lib/libzfs_core/libzfs_core.la - -zstreamdump_LDADD += $(ZLIB) diff --git a/cmd/ztest/Makefile.am b/cmd/ztest/Makefile.am index e3be39a0c..a2f3b5a6b 100644 --- a/cmd/ztest/Makefile.am +++ b/cmd/ztest/Makefile.am @@ -19,4 +19,4 @@ ztest_LDADD = \ $(top_builddir)/lib/libzfs/libzfs.la \ $(top_builddir)/lib/libzfs_core/libzfs_core.la -ztest_LDADD += -lm -ldl +ztest_LDADD += -lm diff --git a/config/user-libuuid.m4 b/config/user-libuuid.m4 index aba375a22..f0da671a3 100644 --- a/config/user-libuuid.m4 +++ b/config/user-libuuid.m4 @@ -7,10 +7,10 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_LIBUUID], [ AC_CHECK_HEADER([uuid/uuid.h], [], [AC_MSG_FAILURE([ *** uuid/uuid.h missing, libuuid-devel package required])]) - AC_CHECK_LIB([uuid], [uuid_generate], [], [AC_MSG_FAILURE([ + AC_SEARCH_LIBS([uuid_generate], [uuid], [], [AC_MSG_FAILURE([ *** uuid_generate() missing, libuuid-devel package required])]) - AC_CHECK_LIB([uuid], [uuid_is_null], [], [AC_MSG_FAILURE([ + AC_SEARCH_LIBS([uuid_is_null], [uuid], [], [AC_MSG_FAILURE([ *** uuid_is_null() missing, libuuid-devel package required])]) AC_SUBST([LIBUUID], ["-luuid"]) diff --git a/config/user-zlib.m4 b/config/user-zlib.m4 index a48361662..82c0962e4 100644 --- a/config/user-zlib.m4 +++ b/config/user-zlib.m4 @@ -7,13 +7,13 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_ZLIB], [ AC_CHECK_HEADER([zlib.h], [], [AC_MSG_FAILURE([ *** zlib.h missing, zlib-devel package required])]) - AC_CHECK_LIB([z], [compress2], [], [AC_MSG_FAILURE([ + AC_SEARCH_LIBS([compress2], [z], [], [AC_MSG_FAILURE([ *** compress2() missing, zlib-devel package required])]) - AC_CHECK_LIB([z], [uncompress], [], [AC_MSG_FAILURE([ + AC_SEARCH_LIBS([uncompress], [z], [], [AC_MSG_FAILURE([ *** uncompress() missing, zlib-devel package required])]) - AC_CHECK_LIB([z], [crc32], [], [AC_MSG_FAILURE([ + AC_SEARCH_LIBS([crc32], [z], [], [AC_MSG_FAILURE([ *** crc32() missing, zlib-devel package required])]) AC_SUBST([ZLIB], ["-lz"]) diff --git a/lib/libefi/Makefile.am b/lib/libefi/Makefile.am index 60863a813..f0c05ee6c 100644 --- a/lib/libefi/Makefile.am +++ b/lib/libefi/Makefile.am @@ -17,6 +17,6 @@ nodist_libefi_la_SOURCES = \ $(USER_C) \ $(KERNEL_C) -libefi_la_LIBADD = $(LIBUUID) $(ZLIB) +libefi_la_LIBADD = $(LIBUUID) EXTRA_DIST = $(USER_C) diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am index b0c698758..a9e2d99fc 100644 --- a/lib/libzfs/Makefile.am +++ b/lib/libzfs/Makefile.am @@ -36,7 +36,7 @@ libzfs_la_LIBADD = \ $(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libzpool/libzpool.la -libzfs_la_LIBADD += -lm -ldl $(LIBBLKID) +libzfs_la_LIBADD += -lm $(LIBBLKID) libzfs_la_LDFLAGS = -version-info 2:0:0 EXTRA_DIST = $(libzfs_pc_DATA) $(USER_C) |