[libdvdcss-devel] build: don't use tiered header checks.

[Diego Elio Pettenò]

libdvdcss | branch: master | Diego Elio Pettenò <***@flameeyes.eu> | Thu Feb 14 07:11:22 2013 -0800| [9023dbe6331fff73e7e3558c08356b111de3f588] | committer: Jean-Baptiste Kempf

build: don't use tiered header checks.

This check is more reliable, and should be easier to deal with.
(cherry picked from commit 9f1158ff4ddd5dee727bd7a43e17a2dde6219a1c)

http://git.videolan.org/gitweb.cgi/libdvdcss.git/?a=commit;h=9023dbe6331fff73e7e3558c08356b111de3f588

---

configure.ac | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4edf6c6..40ab624 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,10 +117,11 @@ AC_CHECK_HEADERS(sys/ioctl.h,[
dnl
dnl Solaris: sys/scsi/scsi_types.h, sys/scsi/impl/uscsi.h
dnl
- AC_CHECK_HEADER(sys/scsi/scsi_types.h,[
- AC_CHECK_HEADER(sys/scsi/impl/uscsi.h,[
- AC_DEFINE(SOLARIS_USCSI, 1, Have userspace SCSI headers.)
- ])
+ solaris_uscsi=yes
+ AC_CHECK_HEADERS([sys/scsi/scsi_types.h, sys/scsi/impl/uscsi.h], [],
+ [solaris_uscsi=no; break;])
+ AS_IF([test "$solaris_uscsi" = "yes"], [
+ AC_DEFINE(SOLARIS_USCSI, 1, Have userspace SCSI headers.)
])
dnl
dnl HP-UX: sys/scsi.h

[Diego Elio Pettenò]

libdvdcss | branch: master | Diego Elio Pettenò <***@flameeyes.eu> | Thu Feb 14 07:11:22 2013 -0800| [391036711755ec403aca99e8668d5755a44be32f] | committer: Jean-Baptiste Kempf

build: don't use tiered header checks.

This check is more reliable, and should be easier to deal with.

http://git.videolan.org/gitweb.cgi/libdvdcss.git/?a=commit;h=391036711755ec403aca99e8668d5755a44be32f

---

configure.ac | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4edf6c6..40ab624 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,10 +117,11 @@ AC_CHECK_HEADERS(sys/ioctl.h,[
dnl
dnl Solaris: sys/scsi/scsi_types.h, sys/scsi/impl/uscsi.h
dnl
- AC_CHECK_HEADER(sys/scsi/scsi_types.h,[
- AC_CHECK_HEADER(sys/scsi/impl/uscsi.h,[
- AC_DEFINE(SOLARIS_USCSI, 1, Have userspace SCSI headers.)
- ])
+ solaris_uscsi=yes
+ AC_CHECK_HEADERS([sys/scsi/scsi_types.h, sys/scsi/impl/uscsi.h], [],
+ [solaris_uscsi=no; break;])
+ AS_IF([test "$solaris_uscsi" = "yes"], [
+ AC_DEFINE(SOLARIS_USCSI, 1, Have userspace SCSI headers.)
])
dnl
dnl HP-UX: sys/scsi.h