diff options
| author | Douglas Gilbert <dgilbert@interlog.com> | 2017-11-15 06:21:21 +0000 |
|---|---|---|
| committer | Douglas Gilbert <dgilbert@interlog.com> | 2017-11-15 06:21:21 +0000 |
| commit | cad489950e9fc29fe8786ddee2e163831abb3322 (patch) | |
| tree | f5263f4d234ec6894c61a8561a4a77c06068c7bc /configure.ac | |
| parent | 098b15e48f02ac4b501dc383456be94b25c1266b (diff) | |
| download | sg3_utils-cad489950e9fc29fe8786ddee2e163831abb3322.tar.gz | |
rename sg_write_atomic to sg_write_x; sg_inq: decode NVMe identify for Linux+FreeBSD
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@731 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 6c35d1af..135a5797 100644 --- a/configure.ac +++ b/configure.ac @@ -16,11 +16,6 @@ ifdef([AM_PROG_AR], [AM_PROG_AR], []) # check for headers AC_HEADER_STDC -AC_CHECK_HEADERS([linux/types.h linux/bsg.h linux/kdev_t.h], [], [], - [[#ifdef HAVE_LINUX_TYPES_H - # include <linux/types.h> - #endif - ]]) # check for functions AC_CHECK_FUNCS(getopt_long, @@ -40,13 +35,26 @@ case "${host}" in *-*-linux-gnu*) AC_DEFINE_UNQUOTED(SG_LIB_LINUX, 1, [sg3_utils on linux]) AC_SUBST([os_cflags], ['']) - AC_SUBST([os_libs], ['']) ;; + AC_SUBST([os_libs], ['']) + AC_CHECK_HEADERS([linux/nvme_ioctl.h], [AC_DEFINE(HAVE_NVME, 1, [Found NVMe])], [], []) + AC_CHECK_HEADERS([linux/types.h linux/bsg.h linux/kdev_t.h], [], [], + [[#ifdef HAVE_LINUX_TYPES_H + # include <linux/types.h> + #endif + ]]) ;; *-*-linux*) AC_DEFINE_UNQUOTED(SG_LIB_LINUX, 1, [sg3_utils on linux]) AC_SUBST([os_cflags], ['']) - AC_SUBST([os_libs], ['']) ;; + AC_SUBST([os_libs], ['']) + AC_CHECK_HEADERS([linux/nvme_ioctl.h], [AC_DEFINE(HAVE_NVME, 1, [Found NVMe])], [], []) + AC_CHECK_HEADERS([linux/types.h linux/bsg.h linux/kdev_t.h], [], [], + [[#ifdef HAVE_LINUX_TYPES_H + # include <linux/types.h> + #endif + ]]) ;; *-*-freebsd*|*-*-kfreebsd*-gnu*) AC_DEFINE_UNQUOTED(SG_LIB_FREEBSD, 1, [sg3_utils on FreeBSD]) + AC_DEFINE(HAVE_NVME, 1, ['Found NVMe']) AC_SUBST([os_cflags], ['']) AC_SUBST([os_libs], ['-lcam']);; *-*-solaris*) @@ -69,7 +77,13 @@ case "${host}" in *) AC_DEFINE_UNQUOTED(SG_LIB_LINUX, 1, [assume sg3_utils on linux]) AC_SUBST([os_cflags], ['']) - AC_SUBST([os_libs], ['']) ;; + AC_SUBST([os_libs], ['']) + AC_CHECK_HEADERS([linux/nvme_ioctl.h], [AC_DEFINE(HAVE_NVME, 1, [Found NVMe])], [], []) + AC_CHECK_HEADERS([linux/types.h linux/bsg.h linux/kdev_t.h], [], [], + [[#ifdef HAVE_LINUX_TYPES_H + # include <linux/types.h> + #endif + ]]) ;; esac # Define platform-specific symbol. |