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

Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt

This commit is contained in:
Brian Behlendorf 2009-02-03 10:02:16 -08:00
parent e0d033ba29 4365c44425
commit 745519bc08
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/user-ioctl.m4
View File

@ -2,7 +2,7 @@ dnl #
dnl # Check for ioctl() dnl # Check for ioctl()
dnl # dnl #
AC_DEFUN([ZFS_AC_CONFIG_USER_IOCTL], [ AC_DEFUN([ZFS_AC_CONFIG_USER_IOCTL], [
AC_MSG_CHECKING(checking for ioctl()) AC_MSG_CHECKING(for ioctl())
AC_EGREP_HEADER(ioctl, unistd.h, is_unistd=yes, is_unistd=no) AC_EGREP_HEADER(ioctl, unistd.h, is_unistd=yes, is_unistd=no)
AC_EGREP_HEADER(ioctl, sys/ioctl.h, is_sys_ioctl=yes, is_sys_ioctl=no) AC_EGREP_HEADER(ioctl, sys/ioctl.h, is_sys_ioctl=yes, is_sys_ioctl=no)
AC_EGREP_HEADER(ioctl, stropts.h, is_stropts=yes, is_stropts=no) AC_EGREP_HEADER(ioctl, stropts.h, is_stropts=yes, is_stropts=no)

11
config/zfs-build.m4
View File

@ -168,10 +168,13 @@ AC_DEFUN([ZFS_AC_SPL], [
]) ])
AC_DEFUN([ZFS_AC_LICENSE], [ AC_DEFUN([ZFS_AC_LICENSE], [
AC_MSG_CHECKING([license]) AC_MSG_CHECKING([zfs license])
AC_MSG_RESULT([CDDL]) license=`grep MODULE_LICENSE module/zfs/zfs_ioctl.c | cut -f2 -d'"'`
dnl # AC_DEFINE([HAVE_GPL_ONLY_SYMBOLS], [1], AC_MSG_RESULT([$license])
dnl # [Define to 1 if module is licensed under the GPL]) if test "$license" = GPL; then
AC_DEFINE([HAVE_GPL_ONLY_SYMBOLS], [1],
[Define to 1 if module is licensed under the GPL])
fi
]) ])
AC_DEFUN([ZFS_AC_DEBUG], [ AC_DEFUN([ZFS_AC_DEBUG], [

2
configure.ac
View File

@ -52,8 +52,8 @@ splbuild=
ZFS_AC_KERNEL ZFS_AC_KERNEL
ZFS_AC_SPL ZFS_AC_SPL
ZFS_AC_CONFIG
ZFS_AC_LICENSE ZFS_AC_LICENSE
ZFS_AC_CONFIG
ZFS_AC_DEBUG ZFS_AC_DEBUG
AC_CONFIG_FILES([ AC_CONFIG_FILES([