Changeset 6019 in orxonox.OLD

Timestamp:

Dec 10, 2005, 7:15:00 PM (18 years ago)

Author:

bensch

Message:

orxonox/branches/avi_play: conditional check in configure.ac

Location:

branches/avi_play

Files:

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

branches/avi_play/config.h.in

@@ -13 +13 @@
 #undef HAVE_AL_AL_H
 
+/* 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
@@ -24 +27 @@
 /* Define to 1 if you have the <curl/curl.h> header file. */
 #undef HAVE_CURL_CURL_H
+
+/* 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. */

branches/avi_play/configure.ac

@@ -669 +669 @@
         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
@@ -678 +680 @@
      fi
   AC_CHECK_LIB([avutil], [main], [FOUND_avutil=yes; LIBS="$LIBS -lavutil"])
-     if test x$FOUND_avutil != xyes ; then
-        echo "------------------"
-        echo "avutil library not found."
-        echo "please install the FFmpeg library, which can be found at http://ffmpeg.sourceforge.net"
-        echo "------------------"
-        exit -1
-     fi
+
   AC_CHECK_LIB([dts], [main], [FOUND_dts=yes; LIBS="$LIBS -ldts"])
-     if test x$FOUND_dts != xyes ; then
-        echo "------------------"
-        echo "dts library not found."
-        echo "please install the FFmpeg library, which can be found at http://ffmpeg.sourceforge.net"
-        echo "------------------"
-        exit -1
-     fi
+