From dce1cbf0ce6376c610f3a535b9727df06f7f6962 Mon Sep 17 00:00:00 2001 From: Kfir Itzhak Date: Sat, 21 Dec 2013 06:47:12 +0200 Subject: [PATCH] Add header file checks for vlc/vlc.h --- CMakeLists.txt | 2 +- configure.ac | 1 + src/zm_libvlc_camera.h | 3 +++ zoneminder-config.cmake | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7802b3d67..83e9d812b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -338,7 +338,7 @@ if(NOT ZM_NO_LIBVLC) set(CMAKE_REQUIRED_INCLUDES "${LIBVLC_INCLUDE_DIR}") endif(LIBVLC_INCLUDE_DIR) mark_as_advanced(FORCE LIBVLC_LIBRARIES LIBVLC_INCLUDE_DIR) - check_include_file("vlc/vlc.h" HAVE_LIBVLC_VLC_H) + check_include_file("vlc/vlc.h" HAVE_VLC_VLC_H) set(optlibsfound "${optlibsfound} libVLC") else(LIBVLC_LIBRARIES) set(optlibsnotfound "${optlibsnotfound} libVLC") diff --git a/configure.ac b/configure.ac index 5e301df9d..6e7451426 100644 --- a/configure.ac +++ b/configure.ac @@ -314,6 +314,7 @@ AC_CHECK_HEADERS(sys/ipc.h,,,) AC_CHECK_HEADERS(sys/shm.h,,,) fi AC_CHECK_HEADERS(zlib.h,,,) +AC_CHECK_HEADERS(vlc/vlc.h,,,) if test "$ZM_SSL_LIB" == "openssl"; then AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires openssl/md5.h - use ZM_SSL_LIB option to select gnutls instead]),[#include diff --git a/src/zm_libvlc_camera.h b/src/zm_libvlc_camera.h index b86d733ba..0e5d94821 100644 --- a/src/zm_libvlc_camera.h +++ b/src/zm_libvlc_camera.h @@ -25,7 +25,10 @@ #include "zm_thread.h" #if HAVE_LIBVLC + +#if HAVE_VLC_VLC_H #include "vlc/vlc.h" +#endif // Used by libvlc callbacks struct LibvlcPrivateData diff --git a/zoneminder-config.cmake b/zoneminder-config.cmake index cf010d503..e7e47b265 100644 --- a/zoneminder-config.cmake +++ b/zoneminder-config.cmake @@ -49,6 +49,7 @@ #cmakedefine HAVE_LIBSWSCALE 1 #cmakedefine HAVE_LIBSWSCALE_SWSCALE_H 1 #cmakedefine HAVE_LIBVLC 1 +#cmakedefine HAVE_VLC_VLC_H 1 /* Authenication checks */ #cmakedefine HAVE_MD5_OPENSSL 1