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

This commit is contained in:
Brian Behlendorf 2009-06-09 16:52:12 -07:00
commit a5e74dcab3
29 changed files with 683 additions and 33 deletions

View File

@ -56,7 +56,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -46,7 +46,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -49,7 +49,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -49,7 +49,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -49,7 +49,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -49,7 +49,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -49,7 +49,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -49,7 +49,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -47,7 +47,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

632
configure vendored
View File

@ -19295,17 +19295,17 @@ echo $ECHO_N "checking for target arch... $ECHO_C" >&6
echo "${ECHO_T}$TARGET_ARCH" >&6
case $TARGET_ARCH in
i386|x86_64|powerpc)
i386|x86_64|powerpc64)
;;
*)
{ { echo "$as_me:$LINENO: error:
*** Unsupported architecture $TARGET_ARCH
*** Available architectures: x86, x86_64, powerpc" >&5
*** Available architectures: x86, x86_64, powerpc64" >&5
echo "$as_me: error:
*** Unsupported architecture $TARGET_ARCH
*** Available architectures: x86, x86_64, powerpc" >&2;}
*** Available architectures: x86, x86_64, powerpc64" >&2;}
{ (exit 1); exit 1; }; }
;;
esac
@ -19625,6 +19625,316 @@ echo "$as_me: error: *** Cannot locate ioctl() definition" >&2;}
echo "${ECHO_T}yes" >&6
fi
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
if test "${ac_cv_header_zlib_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
else
# Is the header compilable?
echo "$as_me:$LINENO: checking zlib.h usability" >&5
echo $ECHO_N "checking zlib.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 <zlib.h>
_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 zlib.h presence" >&5
echo $ECHO_N "checking zlib.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 <zlib.h>
_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: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
{ echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5
echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: zlib.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 zlib.h" >&5
echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
if test "${ac_cv_header_zlib_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_zlib_h=$ac_header_preproc
fi
echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
fi
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
echo "$as_me: error:
*** zlib.h missing, the zlib-devel package is required" >&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
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 compress2 ();
int
main ()
{
compress2 ();
;
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_compress2=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_z_compress2=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_compress2" >&5
echo "${ECHO_T}$ac_cv_lib_z_compress2" >&6
if test $ac_cv_lib_z_compress2 = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
LIBS="-lz $LIBS"
else
{ { echo "$as_me:$LINENO: error:
*** compress2() missing, the zlib-devel package is required" >&5
echo "$as_me: error:
*** compress2() missing, the zlib-devel package is required" >&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
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 uncompress ();
int
main ()
{
uncompress ();
;
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_uncompress=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_z_uncompress=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_uncompress" >&5
echo "${ECHO_T}$ac_cv_lib_z_uncompress" >&6
if test $ac_cv_lib_z_uncompress = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
LIBS="-lz $LIBS"
else
{ { echo "$as_me:$LINENO: error:
*** uncompress() missing, the zlib-devel package is required" >&5
echo "$as_me: error:
*** uncompress() missing, the zlib-devel package is required" >&2;}
{ (exit 1); exit 1; }; }
fi
;;
all)
KERNELMAKE_PARAMS="V=1"
@ -19721,17 +20031,17 @@ echo $ECHO_N "checking for target arch... $ECHO_C" >&6
echo "${ECHO_T}$TARGET_ARCH" >&6
case $TARGET_ARCH in
i386|x86_64|powerpc)
i386|x86_64|powerpc64)
;;
*)
{ { echo "$as_me:$LINENO: error:
*** Unsupported architecture $TARGET_ARCH
*** Available architectures: x86, x86_64, powerpc" >&5
*** Available architectures: x86, x86_64, powerpc64" >&5
echo "$as_me: error:
*** Unsupported architecture $TARGET_ARCH
*** Available architectures: x86, x86_64, powerpc" >&2;}
*** Available architectures: x86, x86_64, powerpc64" >&2;}
{ (exit 1); exit 1; }; }
;;
esac
@ -20051,6 +20361,316 @@ echo "$as_me: error: *** Cannot locate ioctl() definition" >&2;}
echo "${ECHO_T}yes" >&6
fi
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
if test "${ac_cv_header_zlib_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
else
# Is the header compilable?
echo "$as_me:$LINENO: checking zlib.h usability" >&5
echo $ECHO_N "checking zlib.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 <zlib.h>
_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 zlib.h presence" >&5
echo $ECHO_N "checking zlib.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 <zlib.h>
_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: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
{ echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5
echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: zlib.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 zlib.h" >&5
echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
if test "${ac_cv_header_zlib_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_zlib_h=$ac_header_preproc
fi
echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
fi
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
echo "$as_me: error:
*** zlib.h missing, the zlib-devel package is required" >&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
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 compress2 ();
int
main ()
{
compress2 ();
;
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_compress2=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_z_compress2=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_compress2" >&5
echo "${ECHO_T}$ac_cv_lib_z_compress2" >&6
if test $ac_cv_lib_z_compress2 = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
LIBS="-lz $LIBS"
else
{ { echo "$as_me:$LINENO: error:
*** compress2() missing, the zlib-devel package is required" >&5
echo "$as_me: error:
*** compress2() missing, the zlib-devel package is required" >&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
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 uncompress ();
int
main ()
{
uncompress ();
;
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_uncompress=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_z_uncompress=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_uncompress" >&5
echo "${ECHO_T}$ac_cv_lib_z_uncompress" >&6
if test $ac_cv_lib_z_uncompress = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
LIBS="-lz $LIBS"
else
{ { echo "$as_me:$LINENO: error:
*** uncompress() missing, the zlib-devel package is required" >&5
echo "$as_me: error:
*** uncompress() missing, the zlib-devel package is required" >&2;}
{ (exit 1); exit 1; }; }
fi
;;
*)
echo "$as_me:$LINENO: result: Error!" >&5

View File

@ -46,7 +46,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -46,7 +46,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -48,7 +48,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -48,7 +48,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -48,7 +48,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -48,7 +48,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -47,7 +47,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -48,7 +48,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -48,7 +48,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -48,7 +48,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -48,7 +48,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -48,7 +48,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -48,7 +48,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -48,7 +48,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -46,7 +46,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -46,7 +46,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -46,7 +46,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -46,7 +46,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
$(top_srcdir)/config/user-libdiskmgt.m4 \
$(top_srcdir)/config/user-libefi.m4 \
$(top_srcdir)/config/user-libshare.m4 \
$(top_srcdir)/config/user.m4 $(top_srcdir)/config/zfs-build.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)

View File

@ -30,6 +30,9 @@
/* Define to 1 if 'libshare' library available */
#undef HAVE_LIBSHARE
/* Define to 1 if you have the `z' library (-lz). */
#undef HAVE_LIBZ
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H