Qt: fix #4493

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 169fdfcbbe741465943bcbfffc2881ef2f0f333a..8a7e8c5c254da9015d64b04405ecca8d7aa0c31e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -547,8 +547,8 @@ dnl Check for system libs needed
 need_libc=false
 
 dnl Check for usual libc functions
-AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r gettimeofday isatty lstat memalign mmap openat pread posix_fadvise posix_madvise posix_memalign setenv setlocale stricmp strnicmp uselocale])
-AC_REPLACE_FUNCS([asprintf atof atoll getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy vasprintf])
+AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r gettimeofday isatty lstat memalign mmap openat pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp uselocale])
+AC_REPLACE_FUNCS([asprintf atof atoll getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy vasprintf])
 AC_CHECK_FUNCS(fdatasync,,
   [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
 ])
@@ -2454,7 +2454,7 @@ dnl
 AC_ARG_ENABLE(crystalhd,
   [  --enable-crystalhd       crystalhd codec plugin (default disabled)])
 if test "${enable_crystalhd}" == "yes"; then
-    AC_CHECK_HEADERS(libcrystalhd/libcrystalhd_if.h, [
+    AC_CHECK_HEADER(libcrystalhd/libcrystalhd_if.h, [
       VLC_ADD_PLUGIN([crystalhd])
       VLC_ADD_LIBS([crystalhd], [-lcrystalhd])
     ],[
@@ -2468,7 +2468,9 @@ if test "${enable_crystalhd}" == "yes"; then
           AC_MSG_ERROR("Could not find CrystalHD development headers")
         ])
       fi
-    ])
+    ],[#define __LINUX_USER__
+       #include <libcrystalhd/bc_dts_types.h>
+      ])
 fi
 
 dnl
@@ -3681,8 +3683,8 @@ PKG_ENABLE_MODULES_VLC([JACK], [jack access_jack], [jack], [JACK audio I/O modul
 dnl
 dnl UPnP Plugin (Intel SDK)
 dnl
-PKG_ENABLE_MODULES_VLC([UPNP], [upnp_intel], [libupnp], [Intel UPnp SDK],[auto])
-VLC_ADD_CXXFLAGS([upnp_intel],[${UPNP_CFLAGS}])
+PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp], [Intel UPnp SDK],[auto])
+VLC_ADD_CXXFLAGS([upnp],[${UPNP_CFLAGS}])
 
 dnl
 dnl  Interface plugins