From 80cfd98d8e2c1ff9ca1971ead461ddcfc2123d39 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 9 Jun 2009 16:46:26 -0700 Subject: [PATCH] Refresh autogen products --- Makefile.in | 3 +- cmd/Makefile.in | 3 +- cmd/zdb/Makefile.in | 3 +- cmd/zfs/Makefile.in | 3 +- cmd/zinject/Makefile.in | 3 +- cmd/zpios/Makefile.in | 3 +- cmd/zpool/Makefile.in | 3 +- cmd/ztest/Makefile.in | 3 +- config/Makefile.in | 3 +- configure | 632 ++++++++++++++++++++++++++- doc/Makefile.in | 3 +- lib/Makefile.in | 3 +- lib/libavl/Makefile.in | 3 +- lib/libnvpair/Makefile.in | 3 +- lib/libspl/Makefile.in | 3 +- lib/libspl/asm-i386/Makefile.in | 3 +- lib/libspl/asm-powerpc64/Makefile.in | 3 +- lib/libspl/asm-x86_64/Makefile.in | 3 +- lib/libspl/include/Makefile.in | 3 +- lib/libunicode/Makefile.in | 3 +- lib/libuutil/Makefile.in | 3 +- lib/libzfs/Makefile.in | 3 +- lib/libzpool/Makefile.in | 3 +- lib/libzpool/include/Makefile.in | 3 +- scripts/Makefile.in | 3 +- scripts/zpios-profile/Makefile.in | 3 +- scripts/zpios-test/Makefile.in | 3 +- scripts/zpool-config/Makefile.in | 3 +- zfs_config.h.in | 3 + 29 files changed, 683 insertions(+), 33 deletions(-) diff --git a/Makefile.in b/Makefile.in index 81c9e39970..3f7b1e84a9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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) diff --git a/cmd/Makefile.in b/cmd/Makefile.in index b8237f5dce..5ae6776917 100644 --- a/cmd/Makefile.in +++ b/cmd/Makefile.in @@ -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) diff --git a/cmd/zdb/Makefile.in b/cmd/zdb/Makefile.in index bfdd66597a..44ebe7104f 100644 --- a/cmd/zdb/Makefile.in +++ b/cmd/zdb/Makefile.in @@ -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) diff --git a/cmd/zfs/Makefile.in b/cmd/zfs/Makefile.in index b0d7f55087..15684d2740 100644 --- a/cmd/zfs/Makefile.in +++ b/cmd/zfs/Makefile.in @@ -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) diff --git a/cmd/zinject/Makefile.in b/cmd/zinject/Makefile.in index 14a0a0cdac..6b85c55b3b 100644 --- a/cmd/zinject/Makefile.in +++ b/cmd/zinject/Makefile.in @@ -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) diff --git a/cmd/zpios/Makefile.in b/cmd/zpios/Makefile.in index b3f8a1b36d..2385c19748 100644 --- a/cmd/zpios/Makefile.in +++ b/cmd/zpios/Makefile.in @@ -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) diff --git a/cmd/zpool/Makefile.in b/cmd/zpool/Makefile.in index 80b6aecd7a..afda2ec4c5 100644 --- a/cmd/zpool/Makefile.in +++ b/cmd/zpool/Makefile.in @@ -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) diff --git a/cmd/ztest/Makefile.in b/cmd/ztest/Makefile.in index 51138ff251..1abfd643b7 100644 --- a/cmd/ztest/Makefile.in +++ b/cmd/ztest/Makefile.in @@ -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) diff --git a/config/Makefile.in b/config/Makefile.in index 91e6db5322..d04b765290 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -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) diff --git a/configure b/configure index a47da60139..e97dba9dfe 100755 --- a/configure +++ b/configure @@ -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 +_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 +_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 +_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 +_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 diff --git a/doc/Makefile.in b/doc/Makefile.in index e103817665..69dfe53f8c 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -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) diff --git a/lib/Makefile.in b/lib/Makefile.in index c18ec1106e..8cb336805d 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -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) diff --git a/lib/libavl/Makefile.in b/lib/libavl/Makefile.in index e5e814c098..fccd4ef827 100644 --- a/lib/libavl/Makefile.in +++ b/lib/libavl/Makefile.in @@ -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) diff --git a/lib/libnvpair/Makefile.in b/lib/libnvpair/Makefile.in index 9b01344be0..8ed627f0d5 100644 --- a/lib/libnvpair/Makefile.in +++ b/lib/libnvpair/Makefile.in @@ -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) diff --git a/lib/libspl/Makefile.in b/lib/libspl/Makefile.in index 83446073ea..8072b88764 100644 --- a/lib/libspl/Makefile.in +++ b/lib/libspl/Makefile.in @@ -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) diff --git a/lib/libspl/asm-i386/Makefile.in b/lib/libspl/asm-i386/Makefile.in index b403d473bf..e7fd864a2e 100644 --- a/lib/libspl/asm-i386/Makefile.in +++ b/lib/libspl/asm-i386/Makefile.in @@ -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) diff --git a/lib/libspl/asm-powerpc64/Makefile.in b/lib/libspl/asm-powerpc64/Makefile.in index 1abbcc8f90..7e39635359 100644 --- a/lib/libspl/asm-powerpc64/Makefile.in +++ b/lib/libspl/asm-powerpc64/Makefile.in @@ -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) diff --git a/lib/libspl/asm-x86_64/Makefile.in b/lib/libspl/asm-x86_64/Makefile.in index db0cc6a2a1..61f3c35a6b 100644 --- a/lib/libspl/asm-x86_64/Makefile.in +++ b/lib/libspl/asm-x86_64/Makefile.in @@ -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) diff --git a/lib/libspl/include/Makefile.in b/lib/libspl/include/Makefile.in index 3fc1f372c2..e99ea1b8d4 100644 --- a/lib/libspl/include/Makefile.in +++ b/lib/libspl/include/Makefile.in @@ -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) diff --git a/lib/libunicode/Makefile.in b/lib/libunicode/Makefile.in index c5878327ab..c2f6aa3ec2 100644 --- a/lib/libunicode/Makefile.in +++ b/lib/libunicode/Makefile.in @@ -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) diff --git a/lib/libuutil/Makefile.in b/lib/libuutil/Makefile.in index 5e5ce4dc16..7f2e52a4ef 100644 --- a/lib/libuutil/Makefile.in +++ b/lib/libuutil/Makefile.in @@ -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) diff --git a/lib/libzfs/Makefile.in b/lib/libzfs/Makefile.in index 00fde64958..2c59f7d304 100644 --- a/lib/libzfs/Makefile.in +++ b/lib/libzfs/Makefile.in @@ -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) diff --git a/lib/libzpool/Makefile.in b/lib/libzpool/Makefile.in index 11d347836b..49e2ba4b21 100644 --- a/lib/libzpool/Makefile.in +++ b/lib/libzpool/Makefile.in @@ -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) diff --git a/lib/libzpool/include/Makefile.in b/lib/libzpool/include/Makefile.in index 4cdc5dbb1d..89452163a1 100644 --- a/lib/libzpool/include/Makefile.in +++ b/lib/libzpool/include/Makefile.in @@ -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) diff --git a/scripts/Makefile.in b/scripts/Makefile.in index dde017b324..40462a5fde 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -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) diff --git a/scripts/zpios-profile/Makefile.in b/scripts/zpios-profile/Makefile.in index 45abf43e83..6d5b99b256 100644 --- a/scripts/zpios-profile/Makefile.in +++ b/scripts/zpios-profile/Makefile.in @@ -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) diff --git a/scripts/zpios-test/Makefile.in b/scripts/zpios-test/Makefile.in index 39ec01493a..46549fbb70 100644 --- a/scripts/zpios-test/Makefile.in +++ b/scripts/zpios-test/Makefile.in @@ -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) diff --git a/scripts/zpool-config/Makefile.in b/scripts/zpool-config/Makefile.in index fa94a97ada..8c0b443607 100644 --- a/scripts/zpool-config/Makefile.in +++ b/scripts/zpool-config/Makefile.in @@ -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) diff --git a/zfs_config.h.in b/zfs_config.h.in index 1f11323a0b..9e387d340a 100644 --- a/zfs_config.h.in +++ b/zfs_config.h.in @@ -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 header file. */ #undef HAVE_MEMORY_H