git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use zfs_mknode() to create dataset root
[zfs.git]
/
config
/
zfs-build.m4
diff --git
a/config/zfs-build.m4
b/config/zfs-build.m4
index
3ea77ab
..
5215463
100644
(file)
--- a/
config/zfs-build.m4
+++ b/
config/zfs-build.m4
@@
-33,6
+33,10
@@
AC_DEFUN([ZFS_AC_DEBUG], [
AC_MSG_RESULT([$enable_debug])
])
AC_MSG_RESULT([$enable_debug])
])
+AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [
+ ZFS_AC_CONFIG_ALWAYS_NO_UNUSED_BUT_SET_VARIABLE
+])
+
AC_DEFUN([ZFS_AC_CONFIG], [
TARGET_ASM_DIR=asm-generic
AC_SUBST(TARGET_ASM_DIR)
AC_DEFUN([ZFS_AC_CONFIG], [
TARGET_ASM_DIR=asm-generic
AC_SUBST(TARGET_ASM_DIR)
@@
-47,6
+51,8
@@
AC_DEFUN([ZFS_AC_CONFIG], [
AC_MSG_RESULT([$ZFS_CONFIG]);
AC_SUBST(ZFS_CONFIG)
AC_MSG_RESULT([$ZFS_CONFIG]);
AC_SUBST(ZFS_CONFIG)
+ ZFS_AC_CONFIG_ALWAYS
+
case "$ZFS_CONFIG" in
kernel) ZFS_AC_CONFIG_KERNEL ;;
user) ZFS_AC_CONFIG_USER ;;
case "$ZFS_CONFIG" in
kernel) ZFS_AC_CONFIG_KERNEL ;;
user) ZFS_AC_CONFIG_USER ;;
@@
-178,16
+184,20
@@
AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
VENDOR=redhat ;
elif test -f /etc/fedora-release ; then
VENDOR=fedora ;
VENDOR=redhat ;
elif test -f /etc/fedora-release ; then
VENDOR=fedora ;
- elif test -f /etc/
lsb
-release ; then
- VENDOR=
ubuntu
;
+ elif test -f /etc/
gentoo
-release ; then
+ VENDOR=
gentoo
;
elif test -f /etc/debian_version ; then
VENDOR=debian ;
elif test -f /etc/SuSE-release ; then
VENDOR=sles ;
elif test -f /etc/slackware-version ; then
VENDOR=slackware ;
elif test -f /etc/debian_version ; then
VENDOR=debian ;
elif test -f /etc/SuSE-release ; then
VENDOR=sles ;
elif test -f /etc/slackware-version ; then
VENDOR=slackware ;
- elif test -f /etc/gentoo-release ; then
- VENDOR=gentoo ;
+ elif test -f /etc/lsb-release ; then
+ VENDOR=ubuntu ;
+ elif test -f /etc/lunar.release ; then
+ VENDOR=lunar ;
+ elif test -f /etc/arch-release ; then
+ VENDOR=arch ;
else
VENDOR= ;
fi
else
VENDOR= ;
fi
@@
-196,26
+206,40
@@
AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
AC_MSG_CHECKING([default package type])
case "$VENDOR" in
AC_MSG_CHECKING([default package type])
case "$VENDOR" in
- fedora) DEFAULT_PACKAGE=rpm ;;
redhat) DEFAULT_PACKAGE=rpm ;;
redhat) DEFAULT_PACKAGE=rpm ;;
-
sles)
DEFAULT_PACKAGE=rpm ;;
+
fedora)
DEFAULT_PACKAGE=rpm ;;
ubuntu) DEFAULT_PACKAGE=deb ;;
debian) DEFAULT_PACKAGE=deb ;;
ubuntu) DEFAULT_PACKAGE=deb ;;
debian) DEFAULT_PACKAGE=deb ;;
+ sles) DEFAULT_PACKAGE=rpm ;;
slackware) DEFAULT_PACKAGE=tgz ;;
slackware) DEFAULT_PACKAGE=tgz ;;
+ gentoo) DEFAULT_PACKAGE=tgz ;;
+ lunar) DEFAULT_PACKAGE=tgz ;;
*) DEFAULT_PACKAGE=rpm ;;
esac
AC_MSG_RESULT([$DEFAULT_PACKAGE])
AC_SUBST(DEFAULT_PACKAGE)
*) DEFAULT_PACKAGE=rpm ;;
esac
AC_MSG_RESULT([$DEFAULT_PACKAGE])
AC_SUBST(DEFAULT_PACKAGE)
+ AC_MSG_CHECKING([default init directory])
+ case "$VENDOR" in
+ arch) DEFAULT_INIT_DIR=$sysconfdir/rc.d ;;
+ *) DEFAULT_INIT_DIR=$sysconfdir/init.d ;;
+ esac
+
+ AC_MSG_RESULT([$DEFAULT_INIT_DIR])
+ AC_SUBST(DEFAULT_INIT_DIR)
+
AC_MSG_CHECKING([default init script type])
case "$VENDOR" in
AC_MSG_CHECKING([default init script type])
case "$VENDOR" in
+ redhat) DEFAULT_INIT_SCRIPT=redhat ;;
fedora) DEFAULT_INIT_SCRIPT=fedora ;;
fedora) DEFAULT_INIT_SCRIPT=fedora ;;
- redhat) DEFAULT_INIT_SCRIPT=fedora ;;
- sles) DEFAULT_INIT_SCRIPT=lsb ;;
ubuntu) DEFAULT_INIT_SCRIPT=lsb ;;
debian) DEFAULT_INIT_SCRIPT=lsb ;;
ubuntu) DEFAULT_INIT_SCRIPT=lsb ;;
debian) DEFAULT_INIT_SCRIPT=lsb ;;
+ sles) DEFAULT_INIT_SCRIPT=lsb ;;
slackware) DEFAULT_INIT_SCRIPT=lsb ;;
slackware) DEFAULT_INIT_SCRIPT=lsb ;;
+ gentoo) DEFAULT_INIT_SCRIPT=gentoo ;;
+ lunar) DEFAULT_INIT_SCRIPT=lunar ;;
+ arch) DEFAULT_INIT_SCRIPT=arch ;;
*) DEFAULT_INIT_SCRIPT=lsb ;;
esac
*) DEFAULT_INIT_SCRIPT=lsb ;;
esac