]> git.sesse.net Git - vlc/blobdiff - extras/buildsystem/cmake/include/config.cmake
libpostproc/postprocess.h always includes needed headers
[vlc] / extras / buildsystem / cmake / include / config.cmake
index 3a21735fd6ce528b41026dec6b8957f0b50eeb94..35cc80383713641f58308afb1090b204a9a4784a 100644 (file)
@@ -1,9 +1,58 @@
+###########################################################
+# System Includes
+###########################################################
 include( CheckIncludeFile )
 include (CheckTypeSize)
 include (CheckCSourceCompiles)
 include (CheckSymbolExists)
 include (CheckLibraryExists)
 
+###########################################################
+# Options
+###########################################################
+# Options moved before the custom macro includes because those macros need path values, if the ENABLE_CONTRIB
+# has been set.
+
+OPTION( ENABLE_HTTPD           "Enable httpd server" ON )
+OPTION( ENABLE_STREAM_OUT      "Enable stream output plugins" ON )
+OPTION( ENABLE_VLM             "Enable vlm" ON )
+OPTION( ENABLE_DYNAMIC_PLUGINS "Enable dynamic plugin" ON )
+OPTION( UPDATE_CHECK           "Enable automatic new version checking" OFF )
+OPTION( ENABLE_NO_SYMBOL_CHECK "Don't check symbols of modules against libvlc. (Enabling this option speeds up compilation)" OFF )
+OPTION( ENABLE_CONTRIB         "Attempt to use VLC contrib system to get the third-party libraries" ON )
+
+if(ENABLE_CONTRIB)
+
+  set( CONTRIB_INCLUDE ${CMAKE_SOURCE_DIR}/extras/contrib/include)
+  set( CONTRIB_LIB ${CMAKE_SOURCE_DIR}/extras/contrib/lib)
+  set( CONTRIB_PROGRAM ${CMAKE_SOURCE_DIR}/extras/contrib/bin)
+  set( CMAKE_LIBRARY_PATH ${CONTRIB_LIB} ${CMAKE_LIBRARY_PATH} )
+  set( CMAKE_PROGRAM_PATH ${CONTRIB_PROGRAM} ${CMAKE_PROGRAM_PATH} )
+  set( CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -L${CONTRIB_LIB}" )
+  set( CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${CONTRIB_LIB}" )
+  set( CMAKE_SHARED_MODULE_CREATE_C_FLAGS "${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -L${CONTRIB_LIB}" )
+  set( CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS "${CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS} -L${CONTRIB_LIB}" )
+  set( CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS} -L${CONTRIB_LIB}" )
+  set( CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -L${CONTRIB_LIB}" )
+
+  # include extras/contrib/include in the header search pathes
+  include_directories(${CONTRIB_INCLUDE})
+  set( CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${CONTRIB_INCLUDE} )
+  
+  # include the extras/contrib/bin to the search path, otherwise, when finding programs it will automatically
+  # default to system applications (e.g. we should favor the extras/contrib/bin/pkg-config over the system defined
+  # one).
+  if(WIN32)
+    set( ENV{PATH} "${CONTRIB_PROGRAM};$ENV{PATH}" )
+  else(WIN32)
+    set( ENV{PATH} "${CONTRIB_PROGRAM}:$ENV{PATH}" )
+  endif(WIN32)
+endif(ENABLE_CONTRIB)
+
+###########################################################
+# Custom Macro Includes
+###########################################################
+
 include( ${CMAKE_SOURCE_DIR}/cmake/vlc_check_include_files.cmake )
 include( ${CMAKE_SOURCE_DIR}/cmake/vlc_check_functions_exist.cmake )
 include( ${CMAKE_SOURCE_DIR}/cmake/vlc_add_compile_flag.cmake )
@@ -11,37 +60,38 @@ include( ${CMAKE_SOURCE_DIR}/cmake/vlc_check_type.cmake )
 include( ${CMAKE_SOURCE_DIR}/cmake/pkg_check_modules.cmake )
 
 ###########################################################
-# VERSION
+# Versioning
 ###########################################################
 
-set(VLC_VERSION_MAJOR 0)
-set(VLC_VERSION_MINOR 9)
-set(VLC_VERSION_PATCH 0)
+set(VLC_VERSION_MAJOR "0")
+set(VLC_VERSION_MINOR "9")
+set(VLC_VERSION_PATCH "0")
 set(VLC_VERSION_EXTRA "-svn")
+set(VLC_VERSION ${VLC_VERSION_MAJOR}.${VLC_VERSION_MINOR}.${VLC_VERSION_PATCH}${VLC_VERSION_EXTRA})
 
 set(PACKAGE "vlc")
+set(PACKAGE_VERSION "${VLC_VERSION}")
 set(PACKAGE_STRING "vlc")
-set(VERSION_MESSAGE "vlc-${VLC_VERSION_MAJOR}.${VLC_VERSION_MINOR}.${VLC_VERSION_PATCH}${VLC_VERSION_EXTRA}")
+set(VERSION_MESSAGE "vlc-${VLC_VERSION}")
 set(COPYRIGHT_MESSAGE "Copyright © the VideoLAN team")
 set(COPYRIGHT_YEARS "2001-2008")
+set(PACKAGE_VERSION_EXTRA "${VLC_VERSION_EXTRA}")
+set(PACKAGE_VERSION_MAJOR "${VLC_VERSION_MAJOR}")
+set(PACKAGE_VERSION_MINOR "${VLC_VERSION_MINOR}")
+set(PACKAGE_VERSION_REVISION "${VLC_VERSION_PATCH}")
 
 ###########################################################
-# Options
+# Preflight Checks
 ###########################################################
 
-OPTION( ENABLE_HTTPD           "Enable httpd server" ON )
-OPTION( ENABLE_VLM             "Enable vlm" ON )
-OPTION( ENABLE_DYNAMIC_PLUGINS "Enable dynamic plugin" ON )
-OPTION( UPDATE_CHECK           "Enable automatic new version checking" OFF )
-OPTION( ENABLE_NO_SYMBOL_CHECK "Don't check symbols of modules against libvlc. (Enabling this option speeds up compilation)" ON )
-
 IF (NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Debug" CACHE STRING  "build type determining compiler flags" FORCE )
 endif(NOT CMAKE_BUILD_TYPE )
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     set(DEBUG ON)
-    set(NDEBUG ON)
+    add_definitions(-DDEBUG=1)
+    set(NDEBUG OFF)
 endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
 
 set( HAVE_DYNAMIC_PLUGINS ${ENABLE_DYNAMIC_PLUGINS})
@@ -76,6 +126,7 @@ find_package (Threads)
 ###########################################################
 # Functions/structures checks
 ###########################################################
+
 set(CMAKE_REQUIRED_LIBRARIES c)
 set(CMAKE_EXTRA_INCLUDE_FILES string.h)
 vlc_check_functions_exist(strcpy strcasecmp)
@@ -106,13 +157,21 @@ vlc_check_functions_exist(putenv getenv setenv)
 set(CMAKE_EXTRA_INCLUDE_FILES)
 
 set(CMAKE_EXTRA_INCLUDE_FILES unistd.h)
-vlc_check_functions_exist(isatty getcwd getuid)
+vlc_check_functions_exist(isatty getcwd getuid swab)
 set(CMAKE_EXTRA_INCLUDE_FILES)
 
 set(CMAKE_EXTRA_INCLUDE_FILES sys/stat.h)
 vlc_check_functions_exist(lstat fstat stat)
 set(CMAKE_EXTRA_INCLUDE_FILES)
 
+set(CMAKE_EXTRA_INCLUDE_FILES arpa/inet.h)
+vlc_check_functions_exist(inet_aton inet_ntop inet_pton)
+set(CMAKE_EXTRA_INCLUDE_FILES)
+
+set(CMAKE_EXTRA_INCLUDE_FILES sys/mman.h)
+vlc_check_functions_exist(mmap)
+set(CMAKE_EXTRA_INCLUDE_FILES)
+
 set(CMAKE_REQUIRED_LIBRARIES)
 
 check_library_exists(poll poll "" HAVE_POLL)
@@ -135,7 +194,6 @@ check_c_source_compiles (
 
 check_symbol_exists(ntohl "sys/param.h"  NTOHL_IN_SYS_PARAM_H)
 check_symbol_exists(scandir "dirent.h"   HAVE_SCANDIR)
-check_symbol_exists(scandir "dirent.h"   HAVE_SCANDIR)
 check_symbol_exists(localtime_r "time.h" HAVE_LOCALTIME_R)
 check_symbol_exists(alloca "alloca.h"    HAVE_ALLOCA)
 
@@ -176,7 +234,7 @@ endif (HAVE_LIBM)
 
 check_symbol_exists(connect "sys/types.h;sys/socket.h" HAVE_CONNECT)
 if(NOT HAVE_CONNECT)
-    check_library_exists(connect socket HAVE_CONNECT)
+    check_library_exists(connect socket "" HAVE_CONNECT)
     if(NOT HAVE_CONNECT)
         vlc_module_add_link_libraries(libvlc connect)
         vlc_module_add_link_libraries(cdda   connect)
@@ -187,14 +245,20 @@ endif(NOT HAVE_CONNECT)
 ###########################################################
 # Other check
 ###########################################################
+
 include( ${CMAKE_SOURCE_DIR}/cmake/vlc_test_inline.cmake )
 
 ###########################################################
 # Platform check
 ###########################################################
+
 if(APPLE)
     include( ${CMAKE_SOURCE_DIR}/cmake/vlc_find_frameworks.cmake )
 
+    # Mac OS X (10.4 and 10.5)  can't poll a tty properly
+    # So we deactivate its uses
+    set(HAVE_POLL OFF)
+
     if(ENABLE_NO_SYMBOL_CHECK)
         set(DYNAMIC_LOOKUP "-undefined dynamic_lookup")
     else(ENABLE_NO_SYMBOL_CHECK)
@@ -205,19 +269,27 @@ if(APPLE)
     set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS
      "${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} ${DYNAMIC_LOOKUP}")
 
+    # For pre-10.5
+    set( CMAKE_SHARED_LIBRARY_C_FLAGS "${CMAKE_C_FLAGS} -fno-common")
+
     set(SYS_DARWIN 1)
     add_definitions(-std=gnu99) # Hack for obj-c files to be compiled with gnu99
-    vlc_enable_modules(macosx minimal_macosx access_eyetv quartztext)
+    vlc_enable_modules(macosx minimal_macosx opengllayer
+                       access_eyetv quartztext auhal)
 
-    vlc_check_include_files (ApplicationServices/ApplicationServices.h)
-    vlc_check_include_files (Carbon/Carbon.h)
-    vlc_check_include_files (CoreAudio/CoreAudio.h)
+    # On Pre-10.5
+    vlc_module_add_link_flags (ffmpeg "-read_only_relocs warning")
+
+   # vlc_check_include_files (ApplicationServices/ApplicationServices.h)
+   # vlc_check_include_files (Carbon/Carbon.h)
+   # vlc_check_include_files (CoreAudio/CoreAudio.h)
 
    # check_symbol_exists (CFLocaleCopyCurrent "CoreFoundation/CoreFoundation.h" "" HAVE_CFLOCALECOPYCURRENT)
    # check_symbol_exists (CFPreferencesCopyAppValue "CoreFoundation/CoreFoundation.h" "" HAVE_CFPREFERENCESCOPYAPPVALUE)
 
     vlc_find_frameworks(Cocoa Carbon OpenGL AGL IOKit Quicktime
-                        WebKit QuartzCore Foundation ApplicationServices)
+                        WebKit QuartzCore Foundation ApplicationServices
+                        CoreAudio AudioUnit AudioToolbox)
     vlc_module_add_link_libraries(macosx
         ${Cocoa_FRAMEWORKS}
         ${IOKit_FRAMEWORKS}
@@ -239,8 +311,13 @@ if(APPLE)
     vlc_module_add_link_libraries(quartztext
          ${Carbon_FRAMEWORKS}
          ${ApplicationServices_FRAMEWORKS} )
-    vlc_module_add_link_libraries(mp4
-         ${IOKit_FRAMEWORKS} )
+    vlc_module_add_link_libraries(auhal
+         ${Carbon_FRAMEWORKS}
+         ${CoreAudio_FRAMEWORKS}
+         ${AudioUnit_FRAMEWORKS}
+         ${AudioToolbox_FRAMEWORKS} )
+    vlc_module_add_link_libraries(mp4 ${IOKit_FRAMEWORKS} )
+    vlc_module_add_link_libraries(mkv ${IOKit_FRAMEWORKS} )
 
     add_executable(VLC MACOSX_BUNDLE src/vlc.c)
     target_link_libraries(VLC libvlc)
@@ -263,6 +340,7 @@ if(APPLE)
         COMMAND find ${CMAKE_BINARY_DIR}/po -name *.gmo -exec sh -c \"mkdir -p ${MacOS}/locale/\\`basename {}|sed s/\\.gmo//\\`/LC_MESSAGES\; ln -s {} ${MacOS}/locale/\\`basename {}|sed s/\\.gmo//\\`/LC_MESSAGES/vlc.mo\" "\;"
         COMMAND ln -sf VLC ${MacOS}/clivlc #useless?
         COMMAND printf "APPLVLC#" > ${CMAKE_CURRENT_BINARY_DIR}/VLC.app/Contents/PkgInfo
+        COMMAND rm -Rf ${CMAKE_CURRENT_BINARY_DIR}/tmp
     )
     set( MacOS )
 
@@ -277,7 +355,7 @@ macro(command_to_configvar command var)
   COMMAND sh -c "${command}"
   OUTPUT_VARIABLE ${var}
   OUTPUT_STRIP_TRAILING_WHITESPACE)
- string( REPLACE "\n" "\\n" ${var} ${${var}})
+ string( REPLACE "\n" "\\n" ${var} "${${var}}")
 endmacro(command_to_configvar)
 
 command_to_configvar( "whoami" VLC_COMPILE_BY )
@@ -288,7 +366,6 @@ command_to_configvar( "${CMAKE_C_COMPILER} --version" VLC_COMPILER )
 command_to_configvar( "${CMAKE_C_COMPILER} --version" CONFIGURE_LINE )
 set( VLC_COMPILER "${CMAKE_C_COMPILER}" )
 
-
 ###########################################################
 # Modules: Following are all listed in options
 ###########################################################
@@ -311,6 +388,19 @@ vlc_enable_modules(packetizer_mpegvideo packetizer_h264)
 vlc_enable_modules(packetizer_mpeg4video packetizer_mpeg4audio)
 vlc_enable_modules(packetizer_vc1)
 vlc_enable_modules(spatializer)
+vlc_enable_modules(asf)
+
+set(enabled ${ENABLE_STREAM_OUT})
+vlc_register_modules(${enabled} access_output_dummy access_output_udp access_output_file access_output_http)
+vlc_register_modules(${enabled} mux_ps mux_avi mux_mp4 mux_asf mux_dummy mux_wav mux_mpjpeg)
+vlc_register_modules(${enabled} packetizer_copy)
+
+vlc_register_modules(${enabled} stream_out_dummy stream_out_standard stream_out_es stream_out_rtp stream_out_description vod_rtsp)
+vlc_register_modules(${enabled} stream_out_duplicate stream_out_display stream_out_transcode stream_out_bridge stream_out_mosaic_bridge stream_out_autodel)
+vlc_register_modules(${enabled} stream_out_gather)
+# vlc_register_modules(${enabled} stream_out_transrate)
+# vlc_register_modules(${enabled} rtcp)
+vlc_register_modules(${enabled} profile_parser)
 
 if(NOT mingwce)
    set(enabled ON)
@@ -329,10 +419,6 @@ if(NOT WIN32)
    vlc_enable_modules(screensaver)
 endif(NOT WIN32)
 
-# Following modules will be disabled but listed in options
-
-vlc_disable_modules(asf)
-
 # This module is disabled because the CMakeList.txt which
 # is generated isn't correct. We'll put that back
 # when cmake will be accepted as default build system
@@ -341,23 +427,8 @@ vlc_disable_modules(motion)
 ###########################################################
 # libraries
 ###########################################################
-OPTION( ENABLE_CONTRIB "Attempt to use VLC contrib system to get the third-party libraries" ON )
-if(ENABLE_CONTRIB)
-  set( CONTRIB_INCLUDE ${CMAKE_SOURCE_DIR}/extras/contrib/include)
-  set( CONTRIB_LIB ${CMAKE_SOURCE_DIR}/extras/contrib/lib)
-  set( CONTRIB_PROGRAM ${CMAKE_SOURCE_DIR}/extras/contrib/bin)
-  set( CMAKE_LIBRARY_PATH ${CONTRIB_LIB} ${CMAKE_LIBRARY_PATH} )
-  set( CMAKE_PROGRAM_PATH ${CONTRIB_PROGRAM} ${CMAKE_PROGRAM_PATH} )
-  set( CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -L${CONTRIB_LIB}" )
-  set( CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${CONTRIB_LIB}" )
-  set( CMAKE_SHARED_MODULE_CREATE_C_FLAGS "${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -L${CONTRIB_LIB}" )
-  set( CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS "${CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS} -L${CONTRIB_LIB}" )
-  set( CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS} -L${CONTRIB_LIB}" )
-  set( CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -L${CONTRIB_LIB}" )
-  add_definitions(-I${CONTRIB_INCLUDE})
-endif(ENABLE_CONTRIB)
 
-set(CMAKE_REQUIRED_INCLUDES ${CONTRIB_INCLUDE})
+include_directories(${CONTRIB_INCLUDE})
 
 #fixme: use find_package(cddb 0.9.5)
 pkg_check_modules(LIBCDDB libcddb>=0.9.5)
@@ -369,17 +440,47 @@ endif(${LIBCDDB_FOUND})
 find_package(Dlopen)
 set(HAVE_DL_DLOPEN ${Dlopen_FOUND})
 
+# Advanced Linux Sound Architecture (ALSA)
+pkg_check_modules(ALSA alsa>=1.0.0-rc4)
+if (${ALSA_FOUND})
+  set (HAVE_ALSA_NEW_API "1")
+else (${ALSA_FOUND})
+  pkg_check_modules(ALSA alsa)
+endif (${ALSA_FOUND})
+
+if (${ALSA_FOUND})
+  set (HAVE_ALSA "1")
+  vlc_enable_modules(alsa)
+  vlc_add_module_compile_flag(alsa ${ALSA_CFLAGS})
+  vlc_module_add_link_libraries(alsa ${ALSA_LIBRARIES})
+endif (${ALSA_FOUND})
+
+# Open Sound System (OSS)
+# TODO
+
 find_package(FFmpeg)
 if(FFmpeg_FOUND)
-  set(CMAKE_EXTRA_INCLUDE_FILES stdint.h)
-  vlc_check_include_files (ffmpeg/avcodec.h)
-  vlc_check_include_files (ffmpeg/avutil.h)
-  vlc_check_include_files (ffmpeg/swscale.h)
-  vlc_check_include_files (postproc/postprocess.h)
-  set(CMAKE_EXTRA_INCLUDE_FILES)
+  string(REPLACE ";" " " FFmpeg_CFLAGS "${FFmpeg_CFLAGS}")
+  set( CMAKE_REQUIRED_FLAGS_saved ${CMAKE_REQUIRED_FLAGS} )
+  set( CMAKE_REQUIRED_FLAGS ${FFmpeg_CFLAGS} )
+
+  vlc_check_include_files (ffmpeg/avcodec.h libavcodec/avcodec.h)
+  vlc_check_include_files (ffmpeg/avutil.h libavutil/avutil.h)
+  vlc_check_include_files (ffmpeg/swscale.h libswscale/swscale.h)
+  check_c_source_compiles( "#include <stdint.h>\n#include <postproc/postprocess.h>\nint main(){return 0;}" HAVE_POSTPROC_POSTPROCESS_H )
+  vlc_check_include_files (libpostproc/postprocess.h)
+  
+  message( STATUS "avcodec found ${HAVE_FFMPEG_AVCODEC_H} || ${HAVE_LIBAVCODEC_AVCODEC_H}")
+  message( STATUS "avutil found ${HAVE_FFMPEG_AVUTIL_H} || ${HAVE_LIBAVUTIL_AVUTIL_H}")
+  message( STATUS "swscale found ${HAVE_FFMPEG_SWSCALE_H} || ${HAVE_LIBSWSCALE_SWSCALE_H}")
+  message( STATUS "postprocess found ${HAVE_POSTPROC_POSTPROCESS_H} || ${HAVE_LIBPOSTPROC_POSTPROCESS_H}")
+
   vlc_enable_modules(ffmpeg)
-  vlc_add_module_compile_flag(ffmpeg ${FFmpeg_CFLAGS} )
+  vlc_add_module_compile_flag(ffmpeg ${FFmpeg_CFLAGS})
   vlc_module_add_link_libraries(ffmpeg ${FFmpeg_LIBRARIES})
+  
+  set( CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_saved} )
+  set( CMAKE_REQUIRED_FLAGS_saved )
 endif(FFmpeg_FOUND)
 
 find_package(Lua)
@@ -398,7 +499,8 @@ if(QT4_FOUND)
   vlc_check_include_files (qt.h)
   vlc_enable_modules(qt4)
   vlc_add_module_compile_flag(qt4 ${QT_CFLAGS} )
-  vlc_module_add_link_libraries(qt4 ${QT_LIBRARIES})
+  vlc_module_add_link_libraries(qt4 ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+
   # Define our own qt4_wrap_ui macro to match wanted behaviour
   MACRO (VLC_QT4_WRAP_UI outfiles )
     FOREACH (it ${ARGN})
@@ -412,9 +514,27 @@ if(QT4_FOUND)
         MAIN_DEPENDENCY ${infile})
       SET(${outfiles} ${${outfiles}} ${outfile})
     ENDFOREACH (it)
-
   ENDMACRO (VLC_QT4_WRAP_UI)
 
+  MACRO (VLC_QT4_GENERATE_MOC outfiles flags )
+    string(REGEX MATCHALL "[^\\ ]+" flags_list ${flags})
+    FOREACH (it ${ARGN})
+      string(REPLACE ".hpp" ".moc.cpp" outfile "${it}")
+      GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
+      SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/${outfile})
+      ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+        COMMAND mkdir -p `dirname ${outfile}`
+        COMMAND ${QT_MOC_EXECUTABLE} 
+        ARGS ${flags_list}
+        ARGS -I ${CMAKE_BINARY_DIR}/include
+        ARGS -o ${outfile} ${infile}
+        MAIN_DEPENDENCY ${it}
+        )
+      SET(${outfiles} ${${outfiles}} ${outfile})
+    ENDFOREACH (it)
+  ENDMACRO (VLC_QT4_GENERATE_MOC)
+
+
 endif(QT4_FOUND)
 
 find_package(OpenGL)
@@ -427,10 +547,56 @@ if(OPENGL_FOUND)
   vlc_module_add_link_libraries(opengl ${OPENGL_LIBRARIES})
 endif(OPENGL_FOUND)
 
+find_package(Matroska 0.7.7)
+if(Matroska_FOUND)
+  vlc_enable_modules(mkv)
+  vlc_check_include_files (matroska/KaxAttachments.h)
+  vlc_check_include_files (matroska/KaxVersion.h)
+  vlc_module_add_link_libraries(mkv ${Matroska_LIBRARIES})
+endif(Matroska_FOUND)
+
+find_package(Live555)
+if(Live555_FOUND)
+  vlc_enable_modules(live555)
+  vlc_add_module_compile_flag(live555 ${Live555_CFLAGS})
+  vlc_module_add_link_libraries(live555 ${Live555_LIBRARIES})
+endif(Live555_FOUND)
+
+find_package(Curses)
+if(CURSES_LIBRARIES)
+  vlc_enable_modules(ncurses)
+  vlc_module_add_link_libraries(ncurses ${CURSES_LIBRARIES})
+endif(CURSES_LIBRARIES)
+
+find_package(X11)
+if(X11_FOUND)
+  vlc_enable_modules(x11 panoramix)
+  vlc_check_include_files (X11/Xlib.h)
+  vlc_module_add_link_libraries(x11       ${X11_LIBRARIES})
+  vlc_module_add_link_libraries(panoramix ${X11_LIBRARIES})
+endif(X11_FOUND)
+
+find_package(Mpeg2)
+if(Mpeg2_FOUND)
+  vlc_enable_modules(libmpeg2)
+  check_include_files ("stdint.h;mpeg2dec/mpeg2.h" HAVE_MPEG2DEC_MPEG2_H)
+  vlc_module_add_link_libraries(libmpeg2 ${Mpeg2_LIBRARIES})
+endif(Mpeg2_FOUND)
+
+find_package(Dvbpsi)
+if(Dvbpsi_FOUND)
+  vlc_register_modules(${ENABLE_STREAM_OUT} mux_ts)
+  vlc_enable_modules(ts)
+  check_include_files ("stdint.h;dvbpsi/dvbpsi.h;dvbpsi/demux.h;dvbpsi/descriptor.h;dvbpsi/pat.h;dvbpsi/pmt.h;dvbpsi/sdt.h;dvbpsi/dr.h" HAVE_DVBPSI_DR_H)
+  vlc_module_add_link_libraries(ts      ${Dvbpsi_LIBRARIES})
+  vlc_module_add_link_libraries(mux_ts  ${Dvbpsi_LIBRARIES})
+  vlc_module_add_link_libraries(dvb     ${Dvbpsi_LIBRARIES})
+endif(Dvbpsi_FOUND)
+
 set(CMAKE_REQUIRED_INCLUDES)
 
 ###########################################################
 # Final configuration
 ###########################################################
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/include/config.h)
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/include/config.h)