ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add header file checks for vlc/vlc.h

This commit is contained in:
Kfir Itzhak 2013-12-21 06:47:12 +02:00
parent aa6380c4bd
commit dce1cbf0ce
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -338,7 +338,7 @@ if(NOT ZM_NO_LIBVLC)
set(CMAKE_REQUIRED_INCLUDES "${LIBVLC_INCLUDE_DIR}") set(CMAKE_REQUIRED_INCLUDES "${LIBVLC_INCLUDE_DIR}")
endif(LIBVLC_INCLUDE_DIR) endif(LIBVLC_INCLUDE_DIR)
mark_as_advanced(FORCE LIBVLC_LIBRARIES 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") set(optlibsfound "${optlibsfound} libVLC")
else(LIBVLC_LIBRARIES) else(LIBVLC_LIBRARIES)
set(optlibsnotfound "${optlibsnotfound} libVLC") set(optlibsnotfound "${optlibsnotfound} libVLC")

1
configure.ac
View File

@ -314,6 +314,7 @@ AC_CHECK_HEADERS(sys/ipc.h,,,)
AC_CHECK_HEADERS(sys/shm.h,,,) AC_CHECK_HEADERS(sys/shm.h,,,)
fi fi
AC_CHECK_HEADERS(zlib.h,,,) AC_CHECK_HEADERS(zlib.h,,,)
AC_CHECK_HEADERS(vlc/vlc.h,,,)
if test "$ZM_SSL_LIB" == "openssl"; then 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 <stdlib.h> AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires openssl/md5.h - use ZM_SSL_LIB option to select gnutls instead]),[#include <stdlib.h>

3
src/zm_libvlc_camera.h
View File

@ -25,7 +25,10 @@
#include "zm_thread.h" #include "zm_thread.h"
#if HAVE_LIBVLC #if HAVE_LIBVLC
#if HAVE_VLC_VLC_H
#include "vlc/vlc.h" #include "vlc/vlc.h"
#endif
// Used by libvlc callbacks // Used by libvlc callbacks
struct LibvlcPrivateData struct LibvlcPrivateData

1
zoneminder-config.cmake
View File

@ -49,6 +49,7 @@
#cmakedefine HAVE_LIBSWSCALE 1 #cmakedefine HAVE_LIBSWSCALE 1
#cmakedefine HAVE_LIBSWSCALE_SWSCALE_H 1 #cmakedefine HAVE_LIBSWSCALE_SWSCALE_H 1
#cmakedefine HAVE_LIBVLC 1 #cmakedefine HAVE_LIBVLC 1
#cmakedefine HAVE_VLC_VLC_H 1
/* Authenication checks */ /* Authenication checks */
#cmakedefine HAVE_MD5_OPENSSL 1 #cmakedefine HAVE_MD5_OPENSSL 1