Changeset 7695 in orxonox.OLD

Timestamp:

May 18, 2006, 4:02:46 PM (18 years ago)

Author:

bensch

Message:

ffmpeg-stuff

Location:

branches/script_engine

Files:

• config.h.in (modified) (2 diffs)
• configure.ac (modified) (1 diff)

branches/script_engine/config.h.in

@@ -7 +7 @@
 #undef DEBUG
 
-/* Define to 1 if you have the <avcodec.h> header file. */
-#undef HAVE_AVCODEC_H
-
-/* Define to 1 if you have the <avformat.h> header file. */
-#undef HAVE_AVFORMAT_H
-
 /* Define to 1 if you have the `bzero' function. */
 #undef HAVE_BZERO
@@ -18 +12 @@
 /* if we have CURL */
 #undef HAVE_CURL
-
-/* Define to 1 if you have the <ffmpeg/avcodec.h> header file. */
-#undef HAVE_FFMPEG_AVCODEC_H
-
-/* Define to 1 if you have the <ffmpeg/avformat.h> header file. */
-#undef HAVE_FFMPEG_AVFORMAT_H
 
 /* Define to 1 if you have the <GL/glew.h> header file. */

branches/script_engine/configure.ac

@@ -514 +514 @@
 #--------#
 # checking for FFmpeg-headers
-  AC_CHECK_HEADERS([avformat.h] ,,
-      [AC_CHECK_HEADERS([ffmpeg/avformat.h] ,,AC_MSG_ERROR([cannot find FFmpeg header.])]))
-# checking for ffmpeg-lib
-  AC_CHECK_LIB([avformat], [main], [FOUND_avformat=yes; LIBS="$LIBS -lavformat"])
-     if test x$FOUND_avformat != xyes ; then
-        echo "------------------"
-        echo "avformat library not found."
-        echo "please install the FFmpeg library, which can be found at http://ffmpeg.sourceforge.net"
-        echo "------------------"
-        exit -1
-     fi
-  AC_CHECK_HEADERS([avcodec.h] ,,
-      [AC_CHECK_HEADERS([ffmpeg/avcodec.h] ,,AC_MSG_ERROR([cannot find FFmpeg header.])]))
-  AC_CHECK_LIB([avcodec], [main], [FOUND_avcodec=yes; LIBS="$LIBS -lavcodec"])
-     if test x$FOUND_avcodec != xyes ; then
-        echo "------------------"
-        echo "avcodec library not found."
-        echo "please install the FFmpeg library, which can be found at http://ffmpeg.sourceforge.net"
-        echo "------------------"
-        exit -1
-     fi
+  AX_CHECK_REQUIRED_HEADER_LIB([avformat.h ffmpeg/avformat.h] ,[avformat], [main],,, [http://ffmpeg.sourceforge.net])
+  AX_CHECK_REQUIRED_HEADER_LIB([avcodec.h ffmpeg/avcodec.h], [avcodec], [main],,, [http://ffmpeg.sourceforge.net])
+
   AC_CHECK_LIB([avutil], [main], [FOUND_avutil=yes; LIBS="$LIBS -lavutil"])
   AC_CHECK_LIB([xvid], [main], [FOUND_xvid=yes; LIBS="$LIBS -lxvid"])