From aa346379d51cb0b0ed17909bf372b163ae1a553b Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Fri, 27 Jan 2017 12:10:52 +0100 Subject: [PATCH] Detecting Linux systems without generic SCSI support by scsi/scsi.h --- COPYRIGHT | 4 ++-- acinclude.m4 | 21 +++++++++++++++++++++ xorriso/configure_ac.txt | 2 ++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 202be574..15090665 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,8 +1,8 @@ Mario Danic , Vreixo Formoso Thomas Schmitt -libisoburn is Copyright (C) 2007-2014 Vreixo Formoso, Thomas Schmitt -xorriso is Copyright (C) 2007-2014 Thomas Schmitt +libisoburn is Copyright (C) 2007-2017 Vreixo Formoso, Thomas Schmitt +xorriso is Copyright (C) 2007-2017 Thomas Schmitt This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 diff --git a/acinclude.m4 b/acinclude.m4 index d38be8a7..0ebbd8e0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -376,3 +376,24 @@ AC_DEFUN([LIBBURNIA_CHECK_ARCH_LIBS], fi ]) + +dnl LIBBURNIA_CHECK_LINUX_SCSI is by Thomas Schmitt, libburnia project +dnl +AC_DEFUN([LIBBURNIA_CHECK_LINUX_SCSI], +[ + dnl Check whether it is a Linux without scsi/scsi.h + AH_TEMPLATE([Libburn_use_sg_dummY], + [Define to compile without OS specific SCSI features]) + AC_MSG_CHECKING([for missing scsi/scsi.h on Linux]) + AC_TRY_COMPILE([ +#ifdef __linux +#include +#endif + ], + [return;], + [AC_MSG_RESULT([no])], + [AC_DEFINE([Libburn_use_sg_dummY], [yes]) + AC_MSG_RESULT([yes])] + ) +]) + diff --git a/xorriso/configure_ac.txt b/xorriso/configure_ac.txt index 109bc57f..6f7b7f21 100644 --- a/xorriso/configure_ac.txt +++ b/xorriso/configure_ac.txt @@ -311,6 +311,8 @@ then AC_DEFINE([LIBJTE_WITH_ZLIB], []) fi +# There are Linuxes with no public generic SCSI interface +LIBBURNIA_CHECK_LINUX_SCSI # libjte source is included in GNU xorriso. Enable it if zlib is enabled. AH_TEMPLATE([Xorriso_with_libjtE],