Add header file checks for vlc/vlc.h

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")

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 <stdlib.h>

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

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