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

Conflict

This commit is contained in:
Brian Behlendorf 2008-12-15 16:38:04 -08:00
parent d43dd792fe 2712912cb8
commit afc8e4c314
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/Makefile.am
View File

@ -1 +1 @@
EXTRA_DIST = zfs-build.m4 zfs-meta.m4 kernel.m4 user.m4 Rules.am EXTRA_DIST = *.m4 Rules.am

15
config/user.m4
View File

@ -2,19 +2,6 @@ dnl #
dnl # Default ZFS user configuration dnl # Default ZFS user configuration
dnl # dnl #
AC_DEFUN([ZFS_AC_CONFIG_USER], [ AC_DEFUN([ZFS_AC_CONFIG_USER], [
ZFS_AC_CONFIG_USER_LIBEFI
ZFS_AC_CONFIG_USER_IOCTL ZFS_AC_CONFIG_USER_IOCTL
]) ])
AC_DEFINE(ZFS_AC_CONFIG_USER_IOCTL], [
AC_EGREP_HEADER(ioctl, unistd.h,
[AC_DEFINE([HAVE_IOCTL_IN_UNISTD_H], 1,
[Define to 1 if ioctl() is defined in <unistd.h> header])])
AC_EGREP_HEADER(ioctl, sys/ioctl.h,
[AC_DEFINE([HAVE_IOCTL_IN_SYS_IOCTL_H], 1,
[Define to 1 if ioctl() is defined in <sys/ioctl.h> header])])
AC_EGREP_HEADER(ioctl, stropts.h,
[AC_DEFINE([HAVE_IOCTL_IN_STROPTS_H], 1,
[Define to 1 if ioctl() is defined in <stropts.h> header])])
])