[vlc-commits] CrystalHD: autodetect headers when configuring

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Feb 21 13:02:55 2011 +0100| [e37ee832c3644ddf4323565b2594992c5c7ebd3f] | committer: Jean-Baptiste Kempf

CrystalHD: autodetect headers when configuring

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e37ee832c3644ddf4323565b2594992c5c7ebd3f
---

 configure.ac |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 09dc603..d496102 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2453,7 +2453,7 @@ dnl CrystalHD codec plugin
 dnl
 AC_ARG_ENABLE(crystalhd,
   [  --enable-crystalhd       crystalhd codec plugin (default disabled)])
-if test "${enable_crystalhd}" == "yes"; then
+if test "${enable_crystalhd}" != "no"; then
     AC_CHECK_HEADER(libcrystalhd/libcrystalhd_if.h, [
       VLC_ADD_PLUGIN([crystalhd])
       VLC_ADD_LIBS([crystalhd], [-lcrystalhd])
@@ -2465,10 +2465,14 @@ if test "${enable_crystalhd}" == "yes"; then
             VLC_ADD_LIBS([crystalhd], [-lbcmDIL])
             ])
         ],[
-          AC_MSG_ERROR("Could not find CrystalHD development headers")
+          AS_IF([test x"${enable_crystalhd}" = "xyes"],
+                [AC_MSG_ERROR("Could not find CrystalHD development headers")],
+                [AC_MSG_WARN("Could not find CrystalHD development headers")])
+        ],[#define __LINUX_USER__
+               #include <libcrystalhd/bc_dts_types.h>
         ])
       fi
-    ],[#define __LINUX_USER__
+    ],[
        #include <libcrystalhd/bc_dts_types.h>
       ])
 fi