Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/top' into top

This commit is contained in:
Brian Behlendorf 2009-10-15 16:48:28 -07:00
parent b701ef8ff7 69c211131d
commit 54d39796fb
27 changed files with 171 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -61,7 +61,6 @@ am__aclocal_m4_deps = \
$(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 \

1
cmd/Makefile.in
View File

@ -49,7 +49,6 @@ am__aclocal_m4_deps = \
$(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 \

3
cmd/zdb/Makefile.in
View File

@ -52,7 +52,6 @@ am__aclocal_m4_deps = \
$(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 \
@ -264,7 +263,7 @@ zdb_LDADD = \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la
zdb_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID)
zdb_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID) $(LIBBLKID)
all: all-am
.SUFFIXES:

3
cmd/zfs/Makefile.in
View File

@ -52,7 +52,6 @@ am__aclocal_m4_deps = \
$(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 \
@ -265,7 +264,7 @@ zfs_LDADD = \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la
zfs_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID)
zfs_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID) $(LIBBLKID)
all: all-am
.SUFFIXES:

3
cmd/zinject/Makefile.in
View File

@ -52,7 +52,6 @@ am__aclocal_m4_deps = \
$(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 \
@ -266,7 +265,7 @@ zinject_LDADD = \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la
zinject_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID)
zinject_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID) $(LIBBLKID)
all: all-am
.SUFFIXES:

1
cmd/zpios/Makefile.in
View File

@ -52,7 +52,6 @@ am__aclocal_m4_deps = \
$(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 \

3
cmd/zpool/Makefile.in
View File

@ -52,7 +52,6 @@ am__aclocal_m4_deps = \
$(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 \
@ -267,7 +266,7 @@ zpool_LDADD = \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la
zpool_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID)
zpool_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID) $(LIBBLKID)
all: all-am
.SUFFIXES:

3
cmd/ztest/Makefile.in
View File

@ -52,7 +52,6 @@ am__aclocal_m4_deps = \
$(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 \
@ -264,7 +263,7 @@ ztest_LDADD = \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la
ztest_LDFLAGS = -pthread -lm $(ZLIB) -lrt -ldl $(LIBUUID)
ztest_LDFLAGS = -pthread -lm $(ZLIB) -lrt -ldl $(LIBUUID) $(LIBBLKID)
all: all-am
.SUFFIXES:

1
config/Makefile.in
View File

@ -50,7 +50,6 @@ am__aclocal_m4_deps = \
$(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 \

314
configure vendored
View File

@ -19560,80 +19560,6 @@ echo $ECHO_N "checking for target asm dir... $ECHO_C" >&6
echo "${ECHO_T}$TARGET_ASM_DIR" >&6
echo "$as_me:$LINENO: checking for libdiskmgt_error in -ldiskmgt" >&5
echo $ECHO_N "checking for libdiskmgt_error in -ldiskmgt... $ECHO_C" >&6
if test "${ac_cv_lib_diskmgt_libdiskmgt_error+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldiskmgt $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 libdiskmgt_error ();
int
main ()
{
libdiskmgt_error ();
;
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_diskmgt_libdiskmgt_error=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_diskmgt_libdiskmgt_error=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_diskmgt_libdiskmgt_error" >&5
echo "${ECHO_T}$ac_cv_lib_diskmgt_libdiskmgt_error" >&6
if test $ac_cv_lib_diskmgt_libdiskmgt_error = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBDISKMGT 1
_ACEOF
fi
echo "$as_me:$LINENO: checking for sa_init in -lshare" >&5
echo $ECHO_N "checking for sa_init in -lshare... $ECHO_C" >&6
if test "${ac_cv_lib_share_sa_init+set}" = set; then
@ -20120,6 +20046,89 @@ See \`config.log' for more details." >&2;}
fi
echo "$as_me:$LINENO: checking for crc32 in -lz" >&5
echo $ECHO_N "checking for crc32 in -lz... $ECHO_C" >&6
if test "${ac_cv_lib_z_crc32+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lz $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 crc32 ();
int
main ()
{
crc32 ();
;
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_z_crc32=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_z_crc32=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_z_crc32" >&5
echo "${ECHO_T}$ac_cv_lib_z_crc32" >&6
if test $ac_cv_lib_z_crc32 = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
LIBS="-lz $LIBS"
else
{ { echo "$as_me:$LINENO: error:
*** crc32() missing, zlib-devel package required
See \`config.log' for more details." >&5
echo "$as_me: error:
*** crc32() missing, zlib-devel package required
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
fi
ZLIB="-lz"
@ -21231,80 +21240,6 @@ echo $ECHO_N "checking for target asm dir... $ECHO_C" >&6
echo "${ECHO_T}$TARGET_ASM_DIR" >&6
echo "$as_me:$LINENO: checking for libdiskmgt_error in -ldiskmgt" >&5
echo $ECHO_N "checking for libdiskmgt_error in -ldiskmgt... $ECHO_C" >&6
if test "${ac_cv_lib_diskmgt_libdiskmgt_error+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldiskmgt $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 libdiskmgt_error ();
int
main ()
{
libdiskmgt_error ();
;
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_diskmgt_libdiskmgt_error=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_diskmgt_libdiskmgt_error=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_diskmgt_libdiskmgt_error" >&5
echo "${ECHO_T}$ac_cv_lib_diskmgt_libdiskmgt_error" >&6
if test $ac_cv_lib_diskmgt_libdiskmgt_error = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBDISKMGT 1
_ACEOF
fi
echo "$as_me:$LINENO: checking for sa_init in -lshare" >&5
echo $ECHO_N "checking for sa_init in -lshare... $ECHO_C" >&6
if test "${ac_cv_lib_share_sa_init+set}" = set; then
@ -21791,6 +21726,89 @@ See \`config.log' for more details." >&2;}
fi
echo "$as_me:$LINENO: checking for crc32 in -lz" >&5
echo $ECHO_N "checking for crc32 in -lz... $ECHO_C" >&6
if test "${ac_cv_lib_z_crc32+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lz $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 crc32 ();
int
main ()
{
crc32 ();
;
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_z_crc32=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_z_crc32=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_z_crc32" >&5
echo "${ECHO_T}$ac_cv_lib_z_crc32" >&6
if test $ac_cv_lib_z_crc32 = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
LIBS="-lz $LIBS"
else
{ { echo "$as_me:$LINENO: error:
*** crc32() missing, zlib-devel package required
See \`config.log' for more details." >&5
echo "$as_me: error:
*** crc32() missing, zlib-devel package required
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
fi
ZLIB="-lz"

1
doc/Makefile.in
View File

@ -49,7 +49,6 @@ am__aclocal_m4_deps = \
$(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 \

1
lib/Makefile.in
View File

@ -49,7 +49,6 @@ am__aclocal_m4_deps = \
$(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 \

1
lib/libavl/Makefile.in
View File

@ -51,7 +51,6 @@ am__aclocal_m4_deps = \
$(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 \

1
lib/libefi/Makefile.in
View File

@ -51,7 +51,6 @@ am__aclocal_m4_deps = \
$(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 \

1
lib/libnvpair/Makefile.in
View File

@ -51,7 +51,6 @@ am__aclocal_m4_deps = \
$(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 \

1
lib/libspl/Makefile.in
View File

@ -51,7 +51,6 @@ am__aclocal_m4_deps = \
$(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 \

1
lib/libspl/asm-generic/Makefile.in
View File

@ -50,7 +50,6 @@ am__aclocal_m4_deps = \
$(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 \

1
lib/libspl/asm-i386/Makefile.in
View File

@ -51,7 +51,6 @@ am__aclocal_m4_deps = \
$(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 \

1
lib/libspl/asm-x86_64/Makefile.in
View File

@ -51,7 +51,6 @@ am__aclocal_m4_deps = \
$(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 \

1
lib/libspl/include/Makefile.in
View File

@ -51,7 +51,6 @@ am__aclocal_m4_deps = \
$(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 \

1
lib/libunicode/Makefile.in
View File

@ -51,7 +51,6 @@ am__aclocal_m4_deps = \
$(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 \

1
lib/libuutil/Makefile.in
View File

@ -51,7 +51,6 @@ am__aclocal_m4_deps = \
$(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 \

1
lib/libzfs/Makefile.in
View File

@ -51,7 +51,6 @@ am__aclocal_m4_deps = \
$(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 \

1
lib/libzpool/Makefile.in
View File

@ -51,7 +51,6 @@ am__aclocal_m4_deps = \
$(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 \

1
lib/libzpool/include/Makefile.in
View File

@ -51,7 +51,6 @@ am__aclocal_m4_deps = \
$(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 \

1
scripts/Makefile.in
View File

@ -50,7 +50,6 @@ am__aclocal_m4_deps = \
$(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 \

3
zfs_config.h.in
View File

@ -33,9 +33,6 @@
/* 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