diff --git a/configure.ac b/configure.ac
index ee1a1d7124..00e1c179b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -559,7 +559,7 @@ LIBVIRT_STORAGE_ARG_DIR
 LIBVIRT_STORAGE_ARG_FS
 LIBVIRT_STORAGE_ARG_LVM
 LIBVIRT_STORAGE_ARG_ISCSI
-LIBVIRT_ARG_WITH([STORAGE_SCSI], [SCSI backend for the storage driver], [check])
+LIBVIRT_STORAGE_ARG_SCSI
 LIBVIRT_ARG_WITH([STORAGE_MPATH], [mpath backend for the storage driver], [check])
 LIBVIRT_ARG_WITH([STORAGE_DISK], [GPartd Disk backend for the storage driver], [check])
 LIBVIRT_ARG_WITH([STORAGE_RBD], [RADOS Block Device backend for the storage driver], [check])
@@ -592,16 +592,9 @@ fi
 LIBVIRT_STORAGE_CHECK_FS
 LIBVIRT_STORAGE_CHECK_LVM
 LIBVIRT_STORAGE_CHECK_ISCSI
+LIBVIRT_STORAGE_CHECK_SCSI
 
 
-if test "$with_storage_scsi" = "check" || test "$with_storage_scsi" = "yes"; then
-   with_storage_scsi=yes
-
-   AC_DEFINE_UNQUOTED([WITH_STORAGE_SCSI], 1,
-     [whether SCSI backend for storage driver is enabled])
-fi
-AM_CONDITIONAL([WITH_STORAGE_SCSI], [test "$with_storage_scsi" = "yes"])
-
 if test "$with_storage_mpath" = "check" || test "$with_storage_mpath" = "yes"; then
    if test "$with_linux" = "yes"; then
       with_storage_mpath=yes
@@ -1064,7 +1057,7 @@ LIBVIRT_STORAGE_RESULT_DIR
 LIBVIRT_STORAGE_RESULT_FS
 LIBVIRT_STORAGE_RESULT_LVM
 LIBVIRT_STORAGE_RESULT_ISCSI
-AC_MSG_NOTICE([    SCSI: $with_storage_scsi])
+LIBVIRT_STORAGE_RESULT_SCSI
 AC_MSG_NOTICE([   mpath: $with_storage_mpath])
 AC_MSG_NOTICE([    Disk: $with_storage_disk])
 AC_MSG_NOTICE([     RBD: $with_storage_rbd])
diff --git a/m4/virt-storage-scsi.m4 b/m4/virt-storage-scsi.m4
new file mode 100644
index 0000000000..dfaa07e2f7
--- /dev/null
+++ b/m4/virt-storage-scsi.m4
@@ -0,0 +1,36 @@
+dnl The storage SCSI check
+dnl
+dnl Copyright (C) 2016 Red Hat, Inc.
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License, or (at your option) any later version.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library.  If not, see
+dnl <http://www.gnu.org/licenses/>.
+dnl
+
+AC_DEFUN([LIBVIRT_STORAGE_ARG_SCSI], [
+  LIBVIRT_ARG_WITH([STORAGE_SCSI], [SCSI backend for the storage driver], [check])
+])
+
+AC_DEFUN([LIBVIRT_STORAGE_CHECK_SCSI], [
+  if test "$with_storage_scsi" = "check" || test "$with_storage_scsi" = "yes"; then
+    with_storage_scsi=yes
+
+    AC_DEFINE_UNQUOTED([WITH_STORAGE_SCSI], 1,
+                       [whether SCSI backend for storage driver is enabled])
+  fi
+  AM_CONDITIONAL([WITH_STORAGE_SCSI], [test "$with_storage_scsi" = "yes"])
+])
+
+AC_DEFUN([LIBVIRT_STORAGE_RESULT_SCSI], [
+  LIBVIRT_RESULT([SCSI], [$with_storage_scsi])
+])