summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorAndreas Heinchen <heinchen@users.sourceforge.net>2003-04-30 08:49:38 +0000
committerAndreas Heinchen <heinchen@users.sourceforge.net>2003-04-30 08:49:38 +0000
commit7c37edf153ed35a0e753b47fb573e155671f97d3 (patch)
tree62cfa5db0221b774b702a62c4a45c15213e5c700 /configure.ac
parent4f1dc4c3cebf7ba10aa9b59866c4e2f7a0bfd852 (diff)
downloadxine-lib-7c37edf153ed35a0e753b47fb573e155671f97d3.tar.gz
xine-lib-7c37edf153ed35a0e753b47fb573e155671f97d3.tar.bz2
added support for theora
CVS patchset: 4717 CVS date: 2003/04/30 08:49:38
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac21
1 files changed, 19 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 2bc910cf9..8449a3b28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -605,6 +605,19 @@ AM_PATH_OGG(
AM_CONDITIONAL(HAVE_VORBIS, [test x"$no_ogg" != "xyes" -a x"$no_vorbis" != "xyes"])
dnl ---------------------------------------------
+dnl Ogg/Theora libs.
+dnl ---------------------------------------------
+
+echo "these are your cflags before ampath_blabla $CFLAGS "
+
+AM_PATH_OGG(
+ [ AM_PATH_THEORA(AC_DEFINE(HAVE_THEORA,1,[Define this if you have theora]),
+ AC_MSG_RESULT([*** All OGG/THEORA dependent parts will be disabled ***]))
+ ],
+ AC_MSG_RESULT([*** All of OGG/Theora dependent parts will be disabled ***]))
+AM_CONDITIONAL(HAVE_THEORA, [test x"$no_ogg" != "xyes" -a x"$no_theora" != "xyes"])
+
+dnl ---------------------------------------------
dnl check for libFLAC
dnl ---------------------------------------------
AM_PATH_LIBFLAC([],
@@ -1339,6 +1352,7 @@ src/libspudec/Makefile
src/libspucc/Makefile
src/libsputext/Makefile
src/libvorbis/Makefile
+src/libtheora/Makefile
src/libw32dll/Makefile
src/libw32dll/wine/Makefile
src/libw32dll/DirectShow/Makefile
@@ -1439,7 +1453,7 @@ echo " - ac3"
if test x"$enable_asf" = "xyes"; then
echo " - asf"
fi
-if test x"$no_oggvorbis" = "xno"; then
+if test x"$no_vorbis" != "xyes"; then
echo " - ogg"
fi
if test x"$have_libmng" = "xyes"; then
@@ -1470,6 +1484,9 @@ fi
if test x"$have_libpng" = "xyes"; then
echo " - png"
fi
+if test x"$no_theora" != "xyes"; then
+ echo " - theora"
+fi
echo ""
dnl audio decoders
@@ -1480,7 +1497,7 @@ echo " - linear pcm - roqaudio"
echo " - log pcm - gsm610"
echo " - ffmpeg - interplayaudio"
echo " - nosefart"
-if test x"$no_oggvorbis" = "xno"; then
+if test x"$no_vorbis" != "xyes"; then
echo " - vorbis"
fi
if test x"$enable_w32dll" = "xyes"; then