diff options
| author | Brian Behlendorf <[email protected]> | 2008-12-15 10:40:22 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2008-12-15 10:40:22 -0800 |
| commit | 2bdf9cfae3333595b98baa8a7fd4a6fed6d0eb8b (patch) | |
| tree | c8273d77f65f4862a9f7f2586e6dad7d2aaf4186 | |
| parent | e631cff898728c4c9c2c074c187acf4114b7396a (diff) | |
Moving all kernel+user configure magic to the correct topic branches where the features are introduced or needed
| -rw-r--r-- | config/zfs-build.m4 | 25 | ||||
| -rw-r--r-- | configure.ac | 28 |
2 files changed, 0 insertions, 53 deletions
diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 index 074018207..149b96a04 100644 --- a/config/zfs-build.m4 +++ b/config/zfs-build.m4 @@ -361,28 +361,3 @@ AC_DEFUN([ZFS_CHECK_SYMBOL_EXPORT], $3 fi ]) - -dnl # -dnl # 2.6.x API change -dnl # bio_end_io_t uses 2 args (size was dropped from prototype) -dnl # -AC_DEFUN([ZFS_AC_2ARGS_BIO_END_IO_T], - [AC_MSG_CHECKING([whether bio_end_io_t wants 2 args]) - tmp_flags="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="-Werror" - ZFS_LINUX_TRY_COMPILE([ - #include <linux/bio.h> - ],[ - void (*wanted_end_io)(struct bio *, int) = NULL; - bio_end_io_t *local_end_io; - - local_end_io = wanted_end_io; - ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_2ARGS_BIO_END_IO_T, 1, - [bio_end_io_t wants 2 args]) - ],[ - AC_MSG_RESULT(no) - ]) - EXTRA_KCFLAGS="$tmp_flags" -]) diff --git a/configure.ac b/configure.ac index 51ec72c5f..ca6f34085 100644 --- a/configure.ac +++ b/configure.ac @@ -54,34 +54,6 @@ ZFS_AC_SPL ZFS_AC_CONFIG ZFS_AC_LICENSE ZFS_AC_DEBUG -ZFS_AC_2ARGS_BIO_END_IO_T - -AC_CHECK_LIB([diskmgt], [libdiskmgt_error], - [AC_DEFINE([HAVE_LIBDISKMGT], 1, - [Define to 1 if 'libdiskmgt' library available])]) - -AC_CHECK_LIB([efi], [efi_alloc_and_init], - [AC_DEFINE([HAVE_LIBEFI], 1, - [Define to 1 if 'libefi' library available])]) - -AC_CHECK_LIB([share], [sa_init], - [AC_DEFINE([HAVE_LIBSHARE], 1, - [Define to 1 if 'libshare' library available])]) - -AC_EGREP_HEADER(strcmp, strings.h, - [AC_DEFINE([HAVE_STRCMP_IN_STRINGS_H], 1, - [Define to 1 if strcmpl() is defined in <strings.h> header file])]) - -AC_EGREP_HEADER(sysinfo, sys/systeminfo.h, - [AC_DEFINE([HAVE_SYSINFO_IN_SYS_SYSTEMINFO_H], 1, - [Define to 1 if sysinfo() is defined in <sys/systeminfo.h> header file])]) - -#AC_DEFINE([HAVE_ZVOL], 1, ["Define to 1 to include ZVOL support"]) -#AC_DEFINE([HAVE_ZPL], 1, ["Define to 1 to include ZPL support"]) -#AC_DEFINE([WANT_FAKE_IOCTL], 1, ["Define to 1 to use fake ioctl() support"]) -#AC_DEFINE([HAVE_DM_INUSE_SWAP], 1, ["None"]) -#AC_DEFINE([HAVE_UNICODE], 1, ["None"]) -#AC_DEFINE([HAVE_INTTYPES], 1, [Define to 1 if unint16 defined in <sys/types.h>]) AC_CONFIG_FILES([ Makefile config/Makefile |