diff options
| author | Douglas Gilbert <dgilbert@interlog.com> | 2018-02-11 05:01:16 +0000 |
|---|---|---|
| committer | Douglas Gilbert <dgilbert@interlog.com> | 2018-02-11 05:01:16 +0000 |
| commit | 5bdce507b09d32f452a390c22cb98ae7f840c151 (patch) | |
| tree | 40f080676d587b650cfa3133e7dcf3ab3084af0c /configure.ac | |
| parent | 4a5962a81447bb60cca7e51dd005b3bdaab1452b (diff) | |
| download | sg3_utils-5bdce507b09d32f452a390c22cb98ae7f840c151.tar.gz | |
fix compile error in sg_pt_win32.c when NVME_IGNORE; sg_raw: add --cmdfile=CF option
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@752 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 38f08446..354a0220 100644 --- a/configure.ac +++ b/configure.ac @@ -50,7 +50,7 @@ AC_CANONICAL_HOST AC_DEFINE_UNQUOTED(SG_LIB_BUILD_HOST, "${host}", [sg3_utils Build Host]) check_for_linux_nvme_headers() { - AC_CHECK_HEADERS([linux/nvme_ioctl.h], [AC_DEFINE(HAVE_NVME, 1, [Found NVMe])], [], []) + AC_CHECK_HEADERS([linux/nvme_ioctl.h], [AC_DEFINE_UNQUOTED(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> @@ -65,7 +65,7 @@ case "${host}" in check_for_linux_nvme_headers;; *-*-freebsd*|*-*-kfreebsd*-gnu*) AC_DEFINE_UNQUOTED(SG_LIB_FREEBSD, 1, [sg3_utils on FreeBSD]) - AC_DEFINE(HAVE_NVME, 1, [Found NVMe]) + AC_DEFINE_UNQUOTED(HAVE_NVME, 1, [Found NVMe]) LIBS="$LIBS -lcam";; *-*-solaris*) AC_DEFINE_UNQUOTED(SG_LIB_SOLARIS, 1, [sg3_utils on Solaris]);; @@ -73,14 +73,14 @@ case "${host}" in AC_DEFINE_UNQUOTED(SG_LIB_OSF1, 1, [sg3_utils on Tru64 UNIX]);; *-*-cygwin*) AC_DEFINE_UNQUOTED(SG_LIB_WIN32, 1, [sg3_utils on Win32]) - # AC_CHECK_HEADERS([nvme.h], [AC_DEFINE(HAVE_NVME, 1, [Found NVMe])], [], []) - AC_DEFINE(HAVE_NVME, 1, [Found NVMe]) + # AC_CHECK_HEADERS([nvme.h], [AC_DEFINE_UNQUOTED(HAVE_NVME, 1, [Found NVMe])], [], []) + AC_DEFINE_UNQUOTED(HAVE_NVME, 1, [Found NVMe]) CFLAGS="$CFLAGS -Wno-char-subscripts";; *-*-mingw*) AC_DEFINE_UNQUOTED(SG_LIB_WIN32, 1, [sg3_utils on Win32]) AC_DEFINE_UNQUOTED(SG_LIB_MINGW, 1, [also MinGW environment]) - # AC_CHECK_HEADERS([nvme.h], [AC_DEFINE(HAVE_NVME, 1, [Found NVMe])], [], []) - AC_DEFINE(HAVE_NVME, 1, [Found NVMe]) + # AC_CHECK_HEADERS([nvme.h], [AC_DEFINE_UNQUOTED(HAVE_NVME, 1, [Found NVMe])], [], []) + AC_DEFINE_UNQUOTED(HAVE_NVME, 1, [Found NVMe]) CFLAGS="$CFLAGS -D__USE_MINGW_ANSI_STDIO";; *-*-linux-gnu* | *-*-linux* | *) AC_DEFINE_UNQUOTED(SG_LIB_LINUX, 1, [sg3_utils on linux]) |