merge from branch

Modules/FindMPEG2.cmake

@@ -0,0 +1,46 @@
+#
+# Find the native MPEG2 includes and library
+#
+# This module defines
+# MPEG2_INCLUDE_DIR, where to find mpeg2dec/mpeg2.h, etc.
+# MPEG2_LIBRARIES, the libraries to link against to use MPEG2.
+# MPEG2_FOUND, If false, do not try to use MPEG2.
+
+# also defined, but not for general use are
+# MPEG2_mpeg2_LIBRARY, where to find the MPEG2 library.
+# MPEG2_vo_LIBRARY, where to find the vo library.
+
+FIND_PATH(MPEG2_INCLUDE_DIR mpeg2.h
+  /usr/local/include
+  /usr/include
+  /usr/local/livid
+)
+
+FIND_LIBRARY(MPEG2_mpeg2_LIBRARY mpeg2
+  /usr/local/lib
+  /usr/lib
+  /usr/local/livid/mpeg2dec/libmpeg2/.libs
+)
+
+FIND_LIBRARY( MPEG2_vo_LIBRARY vo
+  /usr/local/lib
+  /usr/lib
+  /usr/local/livid/mpeg2dec/libvo/.libs
+)
+
+SET( MPEG2_FOUND "NO" )
+IF(MPEG2_INCLUDE_DIR)
+  IF(MPEG2_mpeg2_LIBRARY)
+    SET( MPEG2_FOUND "YES" )
+    SET( MPEG2_LIBRARIES ${MPEG2_mpeg2_LIBRARY} 
+                         ${MPEG2_vo_LIBRARY})
+
+    #some native mpeg2 installations will depend
+    #on libSDL, if found, add it in.
+    INCLUDE( ${MODULE_PATH}/NewCMake/FindSDL.cmake )
+    IF(SDL_FOUND)
+      SET( MPEG2_LIBRARIES ${MPEG2_LIBRARIES} ${SDL_LIBRARY})
+    ENDIF(SDL_FOUND)
+
+  ENDIF(MPEG2_mpeg2_LIBRARY)
+ENDIF(MPEG2_INCLUDE_DIR)

Modules/FindSDL.cmake

@@ -0,0 +1,33 @@
+# Locate SDL library
+# This module defines
+# SDL_LIBRARY, the name of the library to link against
+# SDL_FOUND, if false, do not try to link to SDL
+# SDL_INCLUDE_DIR, where to find SDL/SDL.h
+#
+# $SDLDIR is an environment variable that would
+# correspond to the ./configure --prefix=$SDLDIR
+# used in building SDL.
+# l.e.galup  9-20-02
+
+
+
+IF (UNIX)
+
+  FIND_LIBRARY(SDL_LIBRARY SDL
+    $ENV{SDLDIR}/lib
+    /usr/lib
+    /usr/local/lib
+  )
+
+  FIND_PATH( SDL_INCLUDE_DIR SDL/SDL.h
+    $ENV{SDLDIR}/include
+    /usr/include
+    /usr/local/include
+  )
+
+ENDIF (UNIX)
+
+SET( SDL_FOUND "NO" )
+IF(SDL_LIBRARY)
+	SET( SDL_FOUND "YES" )
+ENDIF(SDL_LIBRARY)