Illumos #1726: Removal of pyzfs broke delegation for volumes

[zfs.git] / configure

diff --git a/configure b/configure
index 858a32d..23c90c2 100755 (executable)
--- a/configure
+++ b/configure
@@ -12288,17 +12288,25 @@ fi
 $as_echo_n "checking spl source directory... " >&6; }
        if test -z "$splsrc"; then
 
-               sourcelink=`ls -1d /usr/src/spl-*/${LINUX_VERSION} \
+                                                               sourcelink=`ls -1d /usr/src/spl-*/${LINUX_VERSION} \
                            2>/dev/null | tail -1`
 
-               if test -z "$sourcelink" || test ! -e $sourcelink; then
+                                                               if test -z "$sourcelink" || test ! -e $sourcelink/spl_config.h; then
+
+                       sourcelink=`ls -1d /var/lib/dkms/spl/*/build \
+                                   2>/dev/null | tail -1`
+
+fi
+
+
+                                                               if test -z "$sourcelink" || test ! -e $sourcelink/spl_config.h; then
 
                        sourcelink=../spl
 
 fi
 
 
-               if test -e $sourcelink; then
+               if test -e $sourcelink/spl_config.h; then
 
                        splsrc=`readlink -f ${sourcelink}`
 
@@ -19889,17 +19897,25 @@ fi
 $as_echo_n "checking spl source directory... " >&6; }
        if test -z "$splsrc"; then
 
-               sourcelink=`ls -1d /usr/src/spl-*/${LINUX_VERSION} \
+                                                               sourcelink=`ls -1d /usr/src/spl-*/${LINUX_VERSION} \
                            2>/dev/null | tail -1`
 
-               if test -z "$sourcelink" || test ! -e $sourcelink; then
+                                                               if test -z "$sourcelink" || test ! -e $sourcelink/spl_config.h; then
+
+                       sourcelink=`ls -1d /var/lib/dkms/spl/*/build \
+                                   2>/dev/null | tail -1`
+
+fi
+
+
+                                                               if test -z "$sourcelink" || test ! -e $sourcelink/spl_config.h; then
 
                        sourcelink=../spl
 
 fi
 
 
-               if test -e $sourcelink; then
+               if test -e $sourcelink/spl_config.h; then
 
                        splsrc=`readlink -f ${sourcelink}`
 
@@ -27352,7 +27368,7 @@ $as_echo_n "checking whether dmu tx validation is enabled... " >&6; }
 $as_echo "$enable_debug_dmu_tx" >&6; }
 
 
-ac_config_files="$ac_config_files Makefile dracut/Makefile dracut/90zfs/Makefile udev/Makefile udev/rules.d/Makefile etc/Makefile etc/init.d/Makefile etc/zfs/Makefile man/Makefile man/man5/Makefile man/man8/Makefile lib/Makefile lib/libspl/Makefile lib/libspl/asm-generic/Makefile lib/libspl/asm-i386/Makefile lib/libspl/asm-x86_64/Makefile lib/libspl/include/Makefile lib/libspl/include/ia32/Makefile lib/libspl/include/ia32/sys/Makefile lib/libspl/include/rpc/Makefile lib/libspl/include/sys/Makefile lib/libspl/include/sys/sysevent/Makefile lib/libspl/include/sys/dktp/Makefile lib/libspl/include/util/Makefile lib/libavl/Makefile lib/libefi/Makefile lib/libnvpair/Makefile lib/libunicode/Makefile lib/libuutil/Makefile lib/libzpool/Makefile lib/libzfs/Makefile lib/libshare/Makefile cmd/Makefile cmd/zdb/Makefile cmd/zfs/Makefile cmd/zinject/Makefile cmd/zpool/Makefile cmd/ztest/Makefile cmd/zpios/Makefile cmd/mount_zfs/Makefile cmd/zpool_layout/Makefile cmd/zvol_id/Makefile cmd/zpool_id/Makefile cmd/vdev_id/Makefile module/Makefile module/avl/Makefile module/nvpair/Makefile module/unicode/Makefile module/zcommon/Makefile module/zfs/Makefile module/zpios/Makefile include/Makefile include/linux/Makefile include/sys/Makefile include/sys/fs/Makefile include/sys/fm/Makefile include/sys/fm/fs/Makefile scripts/Makefile scripts/zpios-profile/Makefile scripts/zpios-test/Makefile scripts/zpool-config/Makefile scripts/zpool-layout/Makefile scripts/common.sh zfs.spec zfs-modules.spec PKGBUILD-zfs PKGBUILD-zfs-modules zfs-script-config.sh zfs.release"
+ac_config_files="$ac_config_files Makefile dracut/Makefile dracut/90zfs/Makefile udev/Makefile udev/rules.d/Makefile etc/Makefile etc/init.d/Makefile etc/zfs/Makefile man/Makefile man/man5/Makefile man/man8/Makefile lib/Makefile lib/libspl/Makefile lib/libspl/asm-generic/Makefile lib/libspl/asm-i386/Makefile lib/libspl/asm-x86_64/Makefile lib/libspl/include/Makefile lib/libspl/include/ia32/Makefile lib/libspl/include/ia32/sys/Makefile lib/libspl/include/rpc/Makefile lib/libspl/include/sys/Makefile lib/libspl/include/sys/sysevent/Makefile lib/libspl/include/sys/dktp/Makefile lib/libspl/include/util/Makefile lib/libavl/Makefile lib/libefi/Makefile lib/libnvpair/Makefile lib/libunicode/Makefile lib/libuutil/Makefile lib/libzpool/Makefile lib/libzfs/Makefile lib/libshare/Makefile cmd/Makefile cmd/zdb/Makefile cmd/zfs/Makefile cmd/zinject/Makefile cmd/zpool/Makefile cmd/ztest/Makefile cmd/zpios/Makefile cmd/mount_zfs/Makefile cmd/zpool_layout/Makefile cmd/zvol_id/Makefile cmd/zpool_id/Makefile cmd/vdev_id/Makefile module/Makefile module/avl/Makefile module/nvpair/Makefile module/unicode/Makefile module/zcommon/Makefile module/zfs/Makefile module/zpios/Makefile include/Makefile include/linux/Makefile include/sys/Makefile include/sys/fs/Makefile include/sys/fm/Makefile include/sys/fm/fs/Makefile scripts/Makefile scripts/zpios-profile/Makefile scripts/zpios-test/Makefile scripts/zpool-config/Makefile scripts/zpool-layout/Makefile scripts/common.sh zfs.spec zfs-modules.spec PKGBUILD-zfs PKGBUILD-zfs-modules zfs-script-config.sh zfs.release dkms.conf"
 
 
 cat >confcache <<\_ACEOF
@@ -28337,6 +28353,7 @@ do
     "PKGBUILD-zfs-modules") CONFIG_FILES="$CONFIG_FILES PKGBUILD-zfs-modules" ;;
     "zfs-script-config.sh") CONFIG_FILES="$CONFIG_FILES zfs-script-config.sh" ;;
     "zfs.release") CONFIG_FILES="$CONFIG_FILES zfs.release" ;;
+    "dkms.conf") CONFIG_FILES="$CONFIG_FILES dkms.conf" ;;
 
   *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}