Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
This commit is contained in:
commit
6ef9783efb
|
@ -3,6 +3,6 @@
|
||||||
aclocal -I config &&
|
aclocal -I config &&
|
||||||
libtoolize --automake --copy
|
libtoolize --automake --copy
|
||||||
autoheader &&
|
autoheader &&
|
||||||
automake --add-missing --include-deps --copy 2>/dev/null
|
automake --add-missing --include-deps --copy
|
||||||
autoconf
|
autoconf
|
||||||
rm -rf autom4te.cache aclocal.m4
|
rm -rf autom4te.cache aclocal.m4
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
dnl #
|
||||||
|
dnl # Set the target arch for libspl atomic implementation
|
||||||
|
dnl #
|
||||||
|
AC_DEFUN([ZFS_AC_CONFIG_USER_ARCH], [
|
||||||
|
AC_MSG_CHECKING(for target arch)
|
||||||
|
TARGET_ARCH=`echo ${target_cpu} | sed -e s/i.86/i386/`
|
||||||
|
TARGET_ARCH_DIR=asm-$TARGET_ARCH
|
||||||
|
AC_MSG_RESULT([$TARGET_ARCH])
|
||||||
|
|
||||||
|
case $TARGET_ARCH in
|
||||||
|
i386|x86_64|powerpc)
|
||||||
|
AC_SUBST([TARGET_ARCH])
|
||||||
|
AC_SUBST([TARGET_ARCH_DIR])
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
AC_MSG_ERROR([
|
||||||
|
*** Unsupported architecture $TARGET_ARCH
|
||||||
|
*** Available architectures: x86, x86_64, powerpc])
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
])
|
|
@ -2,6 +2,7 @@ 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_ARCH
|
||||||
ZFS_AC_CONFIG_USER_LIBEFI
|
ZFS_AC_CONFIG_USER_LIBEFI
|
||||||
ZFS_AC_CONFIG_USER_LIBDISKMGT
|
ZFS_AC_CONFIG_USER_LIBDISKMGT
|
||||||
ZFS_AC_CONFIG_USER_LIBSHARE
|
ZFS_AC_CONFIG_USER_LIBSHARE
|
||||||
|
|
Loading…
Reference in New Issue