From d1e18d0e3bc4080a1a8a7d2b212175b4a72d5dbc Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 14 Oct 2009 16:00:33 -0700 Subject: [PATCH] Refresh autogen products --- Makefile.in | 5 + cmd/Makefile.in | 5 + cmd/zdb/Makefile.in | 10 +- cmd/zfs/Makefile.in | 10 +- cmd/zinject/Makefile.in | 10 +- cmd/zpios/Makefile.in | 5 + cmd/zpool/Makefile.in | 7 +- cmd/ztest/Makefile.in | 10 +- config/Makefile.in | 5 + configure | 1190 +++++++++++++++++++++++++++- doc/Makefile.in | 5 + lib/Makefile.in | 5 + lib/libavl/Makefile.in | 5 + lib/libefi/Makefile.in | 5 + lib/libnvpair/Makefile.in | 5 + lib/libspl/Makefile.in | 5 + lib/libspl/asm-generic/Makefile.in | 5 + lib/libspl/asm-i386/Makefile.in | 5 + lib/libspl/asm-x86_64/Makefile.in | 5 + lib/libspl/include/Makefile.in | 5 + lib/libunicode/Makefile.in | 5 + lib/libuutil/Makefile.in | 5 + lib/libzfs/Makefile.in | 5 + lib/libzpool/Makefile.in | 5 + lib/libzpool/include/Makefile.in | 5 + scripts/Makefile.in | 5 + zfs_config.h.in | 9 + 27 files changed, 1300 insertions(+), 46 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7f510873d7..ec214d7aae 100644 --- a/Makefile.in +++ b/Makefile.in @@ -60,8 +60,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -142,10 +144,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -189,6 +193,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/cmd/Makefile.in b/cmd/Makefile.in index 6a36ec53cf..4020d6b5dd 100644 --- a/cmd/Makefile.in +++ b/cmd/Makefile.in @@ -48,8 +48,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -114,10 +116,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -161,6 +165,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/cmd/zdb/Makefile.in b/cmd/zdb/Makefile.in index a021613623..b3f3be293a 100644 --- a/cmd/zdb/Makefile.in +++ b/cmd/zdb/Makefile.in @@ -51,8 +51,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -68,6 +70,7 @@ am_zdb_OBJECTS = zdb.$(OBJEXT) zdb_il.$(OBJEXT) zdb_OBJECTS = $(am_zdb_OBJECTS) zdb_DEPENDENCIES = $(top_builddir)/lib/libspl/libspl.la \ $(top_builddir)/lib/libavl/libavl.la \ + $(top_builddir)/lib/libefi/libefi.la \ $(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libunicode/libunicode.la \ $(top_builddir)/lib/libuutil/libuutil.la \ @@ -132,10 +135,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -179,6 +184,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ @@ -227,6 +233,7 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include \ + -I${top_srcdir}/lib/libefi/include \ -I${top_srcdir}/lib/libzpool/include \ -I${top_srcdir}/lib/libnvpair/include \ -I${top_srcdir}/lib/libzfs/include \ @@ -250,13 +257,14 @@ zdb_SOURCES = \ zdb_LDADD = \ $(top_builddir)/lib/libspl/libspl.la \ $(top_builddir)/lib/libavl/libavl.la \ + $(top_builddir)/lib/libefi/libefi.la \ $(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libunicode/libunicode.la \ $(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzfs/libzfs.la -zdb_LDFLAGS = -pthread -lm -lz -lrt +zdb_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID) all: all-am .SUFFIXES: diff --git a/cmd/zfs/Makefile.in b/cmd/zfs/Makefile.in index c52eac2151..14c99c6120 100644 --- a/cmd/zfs/Makefile.in +++ b/cmd/zfs/Makefile.in @@ -51,8 +51,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -68,6 +70,7 @@ am_zfs_OBJECTS = zfs_iter.$(OBJEXT) zfs_main.$(OBJEXT) zfs_OBJECTS = $(am_zfs_OBJECTS) zfs_DEPENDENCIES = $(top_builddir)/lib/libspl/libspl.la \ $(top_builddir)/lib/libavl/libavl.la \ + $(top_builddir)/lib/libefi/libefi.la \ $(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libunicode/libunicode.la \ $(top_builddir)/lib/libuutil/libuutil.la \ @@ -132,10 +135,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -179,6 +184,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ @@ -227,6 +233,7 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include \ + -I${top_srcdir}/lib/libefi/include \ -I${top_srcdir}/lib/libuutil/include \ -I${top_srcdir}/lib/libzfs/include \ -I${top_srcdir}/lib/libnvpair/include \ @@ -251,13 +258,14 @@ zfs_SOURCES = \ zfs_LDADD = \ $(top_builddir)/lib/libspl/libspl.la \ $(top_builddir)/lib/libavl/libavl.la \ + $(top_builddir)/lib/libefi/libefi.la \ $(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libunicode/libunicode.la \ $(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzfs/libzfs.la -zfs_LDFLAGS = -pthread -lm -lz -lrt +zfs_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID) all: all-am .SUFFIXES: diff --git a/cmd/zinject/Makefile.in b/cmd/zinject/Makefile.in index 5897c6d196..f928029ddc 100644 --- a/cmd/zinject/Makefile.in +++ b/cmd/zinject/Makefile.in @@ -51,8 +51,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -68,6 +70,7 @@ am_zinject_OBJECTS = translate.$(OBJEXT) zinject.$(OBJEXT) zinject_OBJECTS = $(am_zinject_OBJECTS) zinject_DEPENDENCIES = $(top_builddir)/lib/libspl/libspl.la \ $(top_builddir)/lib/libavl/libavl.la \ + $(top_builddir)/lib/libefi/libefi.la \ $(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libunicode/libunicode.la \ $(top_builddir)/lib/libuutil/libuutil.la \ @@ -132,10 +135,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -179,6 +184,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ @@ -227,6 +233,7 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include \ + -I${top_srcdir}/lib/libefi/include \ -I${top_srcdir}/lib/libzpool/include \ -I${top_srcdir}/lib/libuutil/include \ -I${top_srcdir}/lib/libzfs/include \ @@ -252,13 +259,14 @@ zinject_SOURCES = \ zinject_LDADD = \ $(top_builddir)/lib/libspl/libspl.la \ $(top_builddir)/lib/libavl/libavl.la \ + $(top_builddir)/lib/libefi/libefi.la \ $(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libunicode/libunicode.la \ $(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzfs/libzfs.la -zinject_LDFLAGS = -pthread -lm -lz -lrt +zinject_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID) all: all-am .SUFFIXES: diff --git a/cmd/zpios/Makefile.in b/cmd/zpios/Makefile.in index 30944529a4..5fef7c8b07 100644 --- a/cmd/zpios/Makefile.in +++ b/cmd/zpios/Makefile.in @@ -51,8 +51,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -126,10 +128,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -173,6 +177,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/cmd/zpool/Makefile.in b/cmd/zpool/Makefile.in index a2dfd13514..8b09d0d208 100644 --- a/cmd/zpool/Makefile.in +++ b/cmd/zpool/Makefile.in @@ -51,8 +51,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -134,10 +136,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -181,6 +185,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ @@ -262,7 +267,7 @@ zpool_LDADD = \ $(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzfs/libzfs.la -zpool_LDFLAGS = -pthread -lm -lz -lrt +zpool_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID) all: all-am .SUFFIXES: diff --git a/cmd/ztest/Makefile.in b/cmd/ztest/Makefile.in index 554b72f67d..3bb461ffe1 100644 --- a/cmd/ztest/Makefile.in +++ b/cmd/ztest/Makefile.in @@ -51,8 +51,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -68,6 +70,7 @@ am_ztest_OBJECTS = ztest.$(OBJEXT) ztest_OBJECTS = $(am_ztest_OBJECTS) ztest_DEPENDENCIES = $(top_builddir)/lib/libspl/libspl.la \ $(top_builddir)/lib/libavl/libavl.la \ + $(top_builddir)/lib/libefi/libefi.la \ $(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libunicode/libunicode.la \ $(top_builddir)/lib/libuutil/libuutil.la \ @@ -132,10 +135,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -179,6 +184,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ @@ -227,6 +233,7 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include \ + -I${top_srcdir}/lib/libefi/include \ -I${top_srcdir}/lib/libzpool/include \ -I${top_srcdir}/lib/libuutil/include \ -I${top_srcdir}/lib/libzfs/include \ @@ -250,13 +257,14 @@ ztest_SOURCES = \ ztest_LDADD = \ $(top_builddir)/lib/libspl/libspl.la \ $(top_builddir)/lib/libavl/libavl.la \ + $(top_builddir)/lib/libefi/libefi.la \ $(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libunicode/libunicode.la \ $(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzfs/libzfs.la -ztest_LDFLAGS = -pthread -lm -lz -lrt -ldl +ztest_LDFLAGS = -pthread -lm $(ZLIB) -lrt -ldl $(LIBUUID) all: all-am .SUFFIXES: diff --git a/config/Makefile.in b/config/Makefile.in index 6f2c243082..447b3e5953 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -49,8 +49,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -106,10 +108,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -153,6 +157,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/configure b/configure index 72666976bd..0b1103e840 100755 --- a/configure +++ b/configure @@ -462,7 +462,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ZFS_META_NAME ZFS_META_VERSION ZFS_META_RELEASE ZFS_META_ALIAS ZFS_META_DATA ZFS_META_AUTHOR ZFS_META_LT_CURRENT ZFS_META_LT_REVISION ZFS_META_LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CCAS CCASFLAGS LICENSE TOPDIR BUILDDIR LIBDIR CMDDIR MODDIR SCRIPTDIR ZFS_CONFIG LINUX LINUX_OBJ LINUX_VERSION LINUX_SYMBOLS SPL SPL_OBJ SPL_VERSION SPL_SYMBOLS KERNELMAKE_PARAMS KERNELCPPFLAGS TARGET_ASM_DIR CONFIG_USER_TRUE CONFIG_USER_FALSE CONFIG_KERNEL_TRUE CONFIG_KERNEL_FALSE LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ZFS_META_NAME ZFS_META_VERSION ZFS_META_RELEASE ZFS_META_ALIAS ZFS_META_DATA ZFS_META_AUTHOR ZFS_META_LT_CURRENT ZFS_META_LT_REVISION ZFS_META_LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CCAS CCASFLAGS LICENSE TOPDIR BUILDDIR LIBDIR CMDDIR MODDIR SCRIPTDIR ZFS_CONFIG LINUX LINUX_OBJ LINUX_VERSION LINUX_SYMBOLS SPL SPL_OBJ SPL_VERSION SPL_SYMBOLS KERNELMAKE_PARAMS KERNELCPPFLAGS TARGET_ASM_DIR ZLIB LIBUUID LIBBLKID CONFIG_USER_TRUE CONFIG_USER_FALSE CONFIG_KERNEL_TRUE CONFIG_KERNEL_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1057,6 +1057,7 @@ Optional Packages: --with-linux-obj=PATH Path to kernel build objects --with-spl=PATH Path to spl source --with-spl-obj=PATH Path to spl build objects + --with-blkid support blkid caching [default=check] Some influential environment variables: CC C compiler command @@ -3999,7 +4000,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4002 "configure"' > conftest.$ac_ext + echo '#line 4003 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5598,7 +5599,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5601:" \ +echo "$as_me:5602:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6661,11 +6662,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6664: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6665: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6668: \$? = $ac_status" >&5 + echo "$as_me:6669: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6929,11 +6930,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6932: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6933: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6936: \$? = $ac_status" >&5 + echo "$as_me:6937: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7033,11 +7034,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7036: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7037: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7040: \$? = $ac_status" >&5 + echo "$as_me:7041: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8502,7 +8503,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 8505 "configure"' > conftest.$ac_ext + echo '#line 8506 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9399,7 +9400,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11846: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11849: \$? = $ac_status" >&5 + echo "$as_me:11850: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11946,11 +11947,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11949: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11950: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11953: \$? = $ac_status" >&5 + echo "$as_me:11954: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12482,7 +12483,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 12485 "configure"' > conftest.$ac_ext + echo '#line 12486 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -13540,11 +13541,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13543: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13544: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13547: \$? = $ac_status" >&5 + echo "$as_me:13548: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13644,11 +13645,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13647: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13648: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13651: \$? = $ac_status" >&5 + echo "$as_me:13652: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15093,7 +15094,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 15096 "configure"' > conftest.$ac_ext + echo '#line 15097 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15871,11 +15872,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15874: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15875: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15878: \$? = $ac_status" >&5 + echo "$as_me:15879: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16139,11 +16140,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16142: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16143: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16146: \$? = $ac_status" >&5 + echo "$as_me:16147: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16243,11 +16244,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16246: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16247: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16250: \$? = $ac_status" >&5 + echo "$as_me:16251: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17712,7 +17713,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 17715 "configure"' > conftest.$ac_ext + echo '#line 17716 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -19800,6 +19801,8 @@ echo "${ECHO_T}yes" >&6 fi + ZLIB= + if test "${ac_cv_header_zlib_h+set}" = set; then echo "$as_me:$LINENO: checking for zlib.h" >&5 echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6 @@ -19941,14 +19944,17 @@ if test $ac_cv_header_zlib_h = yes; then : else { { echo "$as_me:$LINENO: error: - *** zlib.h missing, the zlib-devel package is required" >&5 + *** zlib.h missing, zlib-devel package required +See \`config.log' for more details." >&5 echo "$as_me: error: - *** zlib.h missing, the zlib-devel package is required" >&2;} + *** zlib.h missing, zlib-devel package required +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi + echo "$as_me:$LINENO: checking for compress2 in -lz" >&5 echo $ECHO_N "checking for compress2 in -lz... $ECHO_C" >&6 if test "${ac_cv_lib_z_compress2+set}" = set; then @@ -20022,13 +20028,16 @@ _ACEOF else { { echo "$as_me:$LINENO: error: - *** compress2() missing, the zlib-devel package is required" >&5 + *** compress2() missing, zlib-devel package required +See \`config.log' for more details." >&5 echo "$as_me: error: - *** compress2() missing, the zlib-devel package is required" >&2;} + *** compress2() missing, zlib-devel package required +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi + echo "$as_me:$LINENO: checking for uncompress in -lz" >&5 echo $ECHO_N "checking for uncompress in -lz... $ECHO_C" >&6 if test "${ac_cv_lib_z_uncompress+set}" = set; then @@ -20102,13 +20111,557 @@ _ACEOF else { { echo "$as_me:$LINENO: error: - *** uncompress() missing, the zlib-devel package is required" >&5 + *** uncompress() missing, zlib-devel package required +See \`config.log' for more details." >&5 echo "$as_me: error: - *** uncompress() missing, the zlib-devel package is required" >&2;} + *** uncompress() missing, zlib-devel package required +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi + ZLIB="-lz" + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_ZLIB 1 +_ACEOF + + + + LIBUUID= + + if test "${ac_cv_header_uuid_uuid_h+set}" = set; then + echo "$as_me:$LINENO: checking for uuid/uuid.h" >&5 +echo $ECHO_N "checking for uuid/uuid.h... $ECHO_C" >&6 +if test "${ac_cv_header_uuid_uuid_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_uuid_uuid_h" >&5 +echo "${ECHO_T}$ac_cv_header_uuid_uuid_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking uuid/uuid.h usability" >&5 +echo $ECHO_N "checking uuid/uuid.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking uuid/uuid.h presence" >&5 +echo $ECHO_N "checking uuid/uuid.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: uuid/uuid.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: uuid/uuid.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: uuid/uuid.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: uuid/uuid.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: uuid/uuid.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: uuid/uuid.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: uuid/uuid.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: uuid/uuid.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for uuid/uuid.h" >&5 +echo $ECHO_N "checking for uuid/uuid.h... $ECHO_C" >&6 +if test "${ac_cv_header_uuid_uuid_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_uuid_uuid_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_uuid_uuid_h" >&5 +echo "${ECHO_T}$ac_cv_header_uuid_uuid_h" >&6 + +fi +if test $ac_cv_header_uuid_uuid_h = yes; then + : +else + { { echo "$as_me:$LINENO: error: + *** uuid/uuid.h missing, e2fsprogs-devel package required +See \`config.log' for more details." >&5 +echo "$as_me: error: + *** uuid/uuid.h missing, e2fsprogs-devel package required +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + + + + +echo "$as_me:$LINENO: checking for uuid_generate in -luuid" >&5 +echo $ECHO_N "checking for uuid_generate in -luuid... $ECHO_C" >&6 +if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-luuid $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char uuid_generate (); +int +main () +{ +uuid_generate (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_uuid_uuid_generate=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_uuid_uuid_generate=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_uuid_uuid_generate" >&5 +echo "${ECHO_T}$ac_cv_lib_uuid_uuid_generate" >&6 +if test $ac_cv_lib_uuid_uuid_generate = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBUUID 1 +_ACEOF + + LIBS="-luuid $LIBS" + +else + { { echo "$as_me:$LINENO: error: + *** uuid_generate() missing, e2fsprogs-devel package required +See \`config.log' for more details." >&5 +echo "$as_me: error: + *** uuid_generate() missing, e2fsprogs-devel package required +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + + + +echo "$as_me:$LINENO: checking for uuid_is_null in -luuid" >&5 +echo $ECHO_N "checking for uuid_is_null in -luuid... $ECHO_C" >&6 +if test "${ac_cv_lib_uuid_uuid_is_null+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-luuid $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char uuid_is_null (); +int +main () +{ +uuid_is_null (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_uuid_uuid_is_null=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_uuid_uuid_is_null=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_uuid_uuid_is_null" >&5 +echo "${ECHO_T}$ac_cv_lib_uuid_uuid_is_null" >&6 +if test $ac_cv_lib_uuid_uuid_is_null = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBUUID 1 +_ACEOF + + LIBS="-luuid $LIBS" + +else + { { echo "$as_me:$LINENO: error: + *** uuid_is_null() missing, e2fsprogs-devel package required +See \`config.log' for more details." >&5 +echo "$as_me: error: + *** uuid_is_null() missing, e2fsprogs-devel package required +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + + + LIBUUID="-luuid" + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBUUID 1 +_ACEOF + + + + +# Check whether --with-blkid or --without-blkid was given. +if test "${with_blkid+set}" = set; then + withval="$with_blkid" + +else + with_blkid=check +fi; + + LIBBLKID= + if test "x$with_blkid" != xno; then + + echo "$as_me:$LINENO: checking for blkid_get_cache in -lblkid" >&5 +echo $ECHO_N "checking for blkid_get_cache in -lblkid... $ECHO_C" >&6 +if test "${ac_cv_lib_blkid_blkid_get_cache+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lblkid $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char blkid_get_cache (); +int +main () +{ +blkid_get_cache (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_blkid_blkid_get_cache=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_blkid_blkid_get_cache=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_blkid_blkid_get_cache" >&5 +echo "${ECHO_T}$ac_cv_lib_blkid_blkid_get_cache" >&6 +if test $ac_cv_lib_blkid_blkid_get_cache = yes; then + + echo "$as_me:$LINENO: checking for blkid zfs support" >&5 +echo $ECHO_N "checking for blkid zfs support... $ECHO_C" >&6 + + ZFS_DEV=`mktemp` + dd if=/dev/zero of=$ZFS_DEV bs=1024k count=8 \ + >/dev/null 2>/dev/null + echo -en "\x0c\xb1\xba\0\0\0\0\0" | \ + dd of=$ZFS_DEV bs=1k count=8 \ + seek=132 conv=notrunc &>/dev/null \ + >/dev/null 2>/dev/null + + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="-lblkid" + + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + #include + +int +main () +{ + + blkid_cache cache; + char *value; + + if (blkid_get_cache(&cache, NULL) < 0) + return 1; + + value = blkid_get_tag_value(cache, "TYPE", + "$ZFS_DEV"); + if (!value) { + blkid_put_cache(cache); + return 2; + } + + if (strcmp(value, "zfs")) { + free(value); + blkid_put_cache(cache); + return 3; + } + + free(value); + blkid_put_cache(cache); + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + rm -f $ZFS_DEV + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + LIBBLKID="-lblkid" + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBBLKID 1 +_ACEOF + + +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) + + rm -f $ZFS_DEV + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + if test "x$with_blkid" != xcheck; then + { { echo "$as_me:$LINENO: error: --with-blkid given but unavailable +See \`config.log' for more details." >&5 +echo "$as_me: error: --with-blkid given but unavailable +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + + +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + LDFLAGS="$saved_LDFLAGS" + +else + + if test "x$with_blkid" != xcheck; then + { { echo "$as_me:$LINENO: error: --with-blkid given but unavailable +See \`config.log' for more details." >&5 +echo "$as_me: error: --with-blkid given but unavailable +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + + + +fi + + +fi + + ;; all) @@ -20919,6 +21472,8 @@ echo "${ECHO_T}yes" >&6 fi + ZLIB= + if test "${ac_cv_header_zlib_h+set}" = set; then echo "$as_me:$LINENO: checking for zlib.h" >&5 echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6 @@ -21060,14 +21615,17 @@ if test $ac_cv_header_zlib_h = yes; then : else { { echo "$as_me:$LINENO: error: - *** zlib.h missing, the zlib-devel package is required" >&5 + *** zlib.h missing, zlib-devel package required +See \`config.log' for more details." >&5 echo "$as_me: error: - *** zlib.h missing, the zlib-devel package is required" >&2;} + *** zlib.h missing, zlib-devel package required +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi + echo "$as_me:$LINENO: checking for compress2 in -lz" >&5 echo $ECHO_N "checking for compress2 in -lz... $ECHO_C" >&6 if test "${ac_cv_lib_z_compress2+set}" = set; then @@ -21141,13 +21699,16 @@ _ACEOF else { { echo "$as_me:$LINENO: error: - *** compress2() missing, the zlib-devel package is required" >&5 + *** compress2() missing, zlib-devel package required +See \`config.log' for more details." >&5 echo "$as_me: error: - *** compress2() missing, the zlib-devel package is required" >&2;} + *** compress2() missing, zlib-devel package required +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi + echo "$as_me:$LINENO: checking for uncompress in -lz" >&5 echo $ECHO_N "checking for uncompress in -lz... $ECHO_C" >&6 if test "${ac_cv_lib_z_uncompress+set}" = set; then @@ -21221,13 +21782,557 @@ _ACEOF else { { echo "$as_me:$LINENO: error: - *** uncompress() missing, the zlib-devel package is required" >&5 + *** uncompress() missing, zlib-devel package required +See \`config.log' for more details." >&5 echo "$as_me: error: - *** uncompress() missing, the zlib-devel package is required" >&2;} + *** uncompress() missing, zlib-devel package required +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi + ZLIB="-lz" + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_ZLIB 1 +_ACEOF + + + + LIBUUID= + + if test "${ac_cv_header_uuid_uuid_h+set}" = set; then + echo "$as_me:$LINENO: checking for uuid/uuid.h" >&5 +echo $ECHO_N "checking for uuid/uuid.h... $ECHO_C" >&6 +if test "${ac_cv_header_uuid_uuid_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_uuid_uuid_h" >&5 +echo "${ECHO_T}$ac_cv_header_uuid_uuid_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking uuid/uuid.h usability" >&5 +echo $ECHO_N "checking uuid/uuid.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking uuid/uuid.h presence" >&5 +echo $ECHO_N "checking uuid/uuid.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: uuid/uuid.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: uuid/uuid.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: uuid/uuid.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: uuid/uuid.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: uuid/uuid.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: uuid/uuid.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: uuid/uuid.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: uuid/uuid.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for uuid/uuid.h" >&5 +echo $ECHO_N "checking for uuid/uuid.h... $ECHO_C" >&6 +if test "${ac_cv_header_uuid_uuid_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_uuid_uuid_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_uuid_uuid_h" >&5 +echo "${ECHO_T}$ac_cv_header_uuid_uuid_h" >&6 + +fi +if test $ac_cv_header_uuid_uuid_h = yes; then + : +else + { { echo "$as_me:$LINENO: error: + *** uuid/uuid.h missing, e2fsprogs-devel package required +See \`config.log' for more details." >&5 +echo "$as_me: error: + *** uuid/uuid.h missing, e2fsprogs-devel package required +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + + + + +echo "$as_me:$LINENO: checking for uuid_generate in -luuid" >&5 +echo $ECHO_N "checking for uuid_generate in -luuid... $ECHO_C" >&6 +if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-luuid $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char uuid_generate (); +int +main () +{ +uuid_generate (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_uuid_uuid_generate=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_uuid_uuid_generate=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_uuid_uuid_generate" >&5 +echo "${ECHO_T}$ac_cv_lib_uuid_uuid_generate" >&6 +if test $ac_cv_lib_uuid_uuid_generate = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBUUID 1 +_ACEOF + + LIBS="-luuid $LIBS" + +else + { { echo "$as_me:$LINENO: error: + *** uuid_generate() missing, e2fsprogs-devel package required +See \`config.log' for more details." >&5 +echo "$as_me: error: + *** uuid_generate() missing, e2fsprogs-devel package required +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + + + +echo "$as_me:$LINENO: checking for uuid_is_null in -luuid" >&5 +echo $ECHO_N "checking for uuid_is_null in -luuid... $ECHO_C" >&6 +if test "${ac_cv_lib_uuid_uuid_is_null+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-luuid $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char uuid_is_null (); +int +main () +{ +uuid_is_null (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_uuid_uuid_is_null=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_uuid_uuid_is_null=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_uuid_uuid_is_null" >&5 +echo "${ECHO_T}$ac_cv_lib_uuid_uuid_is_null" >&6 +if test $ac_cv_lib_uuid_uuid_is_null = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBUUID 1 +_ACEOF + + LIBS="-luuid $LIBS" + +else + { { echo "$as_me:$LINENO: error: + *** uuid_is_null() missing, e2fsprogs-devel package required +See \`config.log' for more details." >&5 +echo "$as_me: error: + *** uuid_is_null() missing, e2fsprogs-devel package required +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + + + LIBUUID="-luuid" + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBUUID 1 +_ACEOF + + + + +# Check whether --with-blkid or --without-blkid was given. +if test "${with_blkid+set}" = set; then + withval="$with_blkid" + +else + with_blkid=check +fi; + + LIBBLKID= + if test "x$with_blkid" != xno; then + + echo "$as_me:$LINENO: checking for blkid_get_cache in -lblkid" >&5 +echo $ECHO_N "checking for blkid_get_cache in -lblkid... $ECHO_C" >&6 +if test "${ac_cv_lib_blkid_blkid_get_cache+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lblkid $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char blkid_get_cache (); +int +main () +{ +blkid_get_cache (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_blkid_blkid_get_cache=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_blkid_blkid_get_cache=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_blkid_blkid_get_cache" >&5 +echo "${ECHO_T}$ac_cv_lib_blkid_blkid_get_cache" >&6 +if test $ac_cv_lib_blkid_blkid_get_cache = yes; then + + echo "$as_me:$LINENO: checking for blkid zfs support" >&5 +echo $ECHO_N "checking for blkid zfs support... $ECHO_C" >&6 + + ZFS_DEV=`mktemp` + dd if=/dev/zero of=$ZFS_DEV bs=1024k count=8 \ + >/dev/null 2>/dev/null + echo -en "\x0c\xb1\xba\0\0\0\0\0" | \ + dd of=$ZFS_DEV bs=1k count=8 \ + seek=132 conv=notrunc &>/dev/null \ + >/dev/null 2>/dev/null + + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="-lblkid" + + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + #include + +int +main () +{ + + blkid_cache cache; + char *value; + + if (blkid_get_cache(&cache, NULL) < 0) + return 1; + + value = blkid_get_tag_value(cache, "TYPE", + "$ZFS_DEV"); + if (!value) { + blkid_put_cache(cache); + return 2; + } + + if (strcmp(value, "zfs")) { + free(value); + blkid_put_cache(cache); + return 3; + } + + free(value); + blkid_put_cache(cache); + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + rm -f $ZFS_DEV + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + LIBBLKID="-lblkid" + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBBLKID 1 +_ACEOF + + +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) + + rm -f $ZFS_DEV + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + if test "x$with_blkid" != xcheck; then + { { echo "$as_me:$LINENO: error: --with-blkid given but unavailable +See \`config.log' for more details." >&5 +echo "$as_me: error: --with-blkid given but unavailable +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + + +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + LDFLAGS="$saved_LDFLAGS" + +else + + if test "x$with_blkid" != xcheck; then + { { echo "$as_me:$LINENO: error: --with-blkid given but unavailable +See \`config.log' for more details." >&5 +echo "$as_me: error: --with-blkid given but unavailable +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + + + +fi + + +fi + + ;; *) echo "$as_me:$LINENO: result: Error!" >&5 @@ -22165,6 +23270,9 @@ s,@SPL_SYMBOLS@,$SPL_SYMBOLS,;t t s,@KERNELMAKE_PARAMS@,$KERNELMAKE_PARAMS,;t t s,@KERNELCPPFLAGS@,$KERNELCPPFLAGS,;t t s,@TARGET_ASM_DIR@,$TARGET_ASM_DIR,;t t +s,@ZLIB@,$ZLIB,;t t +s,@LIBUUID@,$LIBUUID,;t t +s,@LIBBLKID@,$LIBBLKID,;t t s,@CONFIG_USER_TRUE@,$CONFIG_USER_TRUE,;t t s,@CONFIG_USER_FALSE@,$CONFIG_USER_FALSE,;t t s,@CONFIG_KERNEL_TRUE@,$CONFIG_KERNEL_TRUE,;t t diff --git a/doc/Makefile.in b/doc/Makefile.in index 716625a012..c2ad5d5302 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -48,8 +48,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -105,10 +107,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -152,6 +156,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/lib/Makefile.in b/lib/Makefile.in index f0e5498c0d..86ec9bdfc8 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -48,8 +48,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -114,10 +116,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -161,6 +165,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/lib/libavl/Makefile.in b/lib/libavl/Makefile.in index 432181e32e..ad838cbd87 100644 --- a/lib/libavl/Makefile.in +++ b/lib/libavl/Makefile.in @@ -50,8 +50,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -131,10 +133,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -178,6 +182,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/lib/libefi/Makefile.in b/lib/libefi/Makefile.in index 36dffe3d07..982fcec8ac 100644 --- a/lib/libefi/Makefile.in +++ b/lib/libefi/Makefile.in @@ -50,8 +50,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -131,10 +133,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -178,6 +182,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/lib/libnvpair/Makefile.in b/lib/libnvpair/Makefile.in index 072bc4274f..5291c06598 100644 --- a/lib/libnvpair/Makefile.in +++ b/lib/libnvpair/Makefile.in @@ -50,8 +50,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -132,10 +134,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -179,6 +183,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/lib/libspl/Makefile.in b/lib/libspl/Makefile.in index e2f751c190..2fbe425e3f 100644 --- a/lib/libspl/Makefile.in +++ b/lib/libspl/Makefile.in @@ -50,8 +50,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -142,10 +144,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -189,6 +193,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/lib/libspl/asm-generic/Makefile.in b/lib/libspl/asm-generic/Makefile.in index 8d48495191..7f3fc94588 100644 --- a/lib/libspl/asm-generic/Makefile.in +++ b/lib/libspl/asm-generic/Makefile.in @@ -49,8 +49,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -106,10 +108,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -153,6 +157,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/lib/libspl/asm-i386/Makefile.in b/lib/libspl/asm-i386/Makefile.in index 92a0a41dcb..c9ec7a2b7c 100644 --- a/lib/libspl/asm-i386/Makefile.in +++ b/lib/libspl/asm-i386/Makefile.in @@ -50,8 +50,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -110,10 +112,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -157,6 +161,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/lib/libspl/asm-x86_64/Makefile.in b/lib/libspl/asm-x86_64/Makefile.in index eb58e2c648..ec805fa324 100644 --- a/lib/libspl/asm-x86_64/Makefile.in +++ b/lib/libspl/asm-x86_64/Makefile.in @@ -50,8 +50,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -110,10 +112,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -157,6 +161,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/lib/libspl/include/Makefile.in b/lib/libspl/include/Makefile.in index ba05a6a511..f262ceaf27 100644 --- a/lib/libspl/include/Makefile.in +++ b/lib/libspl/include/Makefile.in @@ -50,8 +50,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -118,10 +120,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -165,6 +169,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/lib/libunicode/Makefile.in b/lib/libunicode/Makefile.in index 59f09f1d59..b0dd496c12 100644 --- a/lib/libunicode/Makefile.in +++ b/lib/libunicode/Makefile.in @@ -50,8 +50,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -131,10 +133,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -178,6 +182,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/lib/libuutil/Makefile.in b/lib/libuutil/Makefile.in index e24edd1fce..3da37cbc81 100644 --- a/lib/libuutil/Makefile.in +++ b/lib/libuutil/Makefile.in @@ -50,8 +50,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -133,10 +135,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -180,6 +184,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/lib/libzfs/Makefile.in b/lib/libzfs/Makefile.in index 11593af046..0da31f3857 100644 --- a/lib/libzfs/Makefile.in +++ b/lib/libzfs/Makefile.in @@ -50,8 +50,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -134,10 +136,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -181,6 +185,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/lib/libzpool/Makefile.in b/lib/libzpool/Makefile.in index 56ecae58db..48fb16bb70 100644 --- a/lib/libzpool/Makefile.in +++ b/lib/libzpool/Makefile.in @@ -50,8 +50,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -151,10 +153,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -198,6 +202,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/lib/libzpool/include/Makefile.in b/lib/libzpool/include/Makefile.in index 94e8eb29ab..f2f8c9b054 100644 --- a/lib/libzpool/include/Makefile.in +++ b/lib/libzpool/include/Makefile.in @@ -50,8 +50,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -118,10 +120,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -165,6 +169,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index a82fe46fb5..62457315a7 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -49,8 +49,10 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel.m4 \ $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ $(top_srcdir)/config/zfs-build.m4 \ $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac @@ -115,10 +117,12 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LDFLAGS = @LDFLAGS@ +LIBBLKID = @LIBBLKID@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUUID = @LIBUUID@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ @@ -162,6 +166,7 @@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ ZFS_META_NAME = @ZFS_META_NAME@ ZFS_META_RELEASE = @ZFS_META_RELEASE@ ZFS_META_VERSION = @ZFS_META_VERSION@ +ZLIB = @ZLIB@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/zfs_config.h.in b/zfs_config.h.in index 8e02e0c2b8..5273d62ff6 100644 --- a/zfs_config.h.in +++ b/zfs_config.h.in @@ -30,12 +30,18 @@ /* Define to 1 if ioctl() defined in */ #undef HAVE_IOCTL_IN_UNISTD_H +/* Define if you have libblkid */ +#undef HAVE_LIBBLKID + /* Define to 1 if 'libdiskmgt' library available */ #undef HAVE_LIBDISKMGT /* Define to 1 if 'libshare' library available */ #undef HAVE_LIBSHARE +/* Define if you have libuuid */ +#undef HAVE_LIBUUID + /* Define to 1 if you have the `z' library (-lz). */ #undef HAVE_LIBZ @@ -66,6 +72,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define if you have zlib */ +#undef HAVE_ZLIB + /* Define to 1 to disable debug tracing */ #undef NDEBUG