summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-10-04 17:58:11 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-10-04 17:58:11 +0000
commit0d7300028e05b0b0a8f5314ed6fc51fc14b76684 (patch)
treecf3c86a6ed827cd206c07105fec68fbde145a409 /configure
parenta547ff46c0044d44f1fe2d7bfb2d1f21d8c5222a (diff)
downloadmpv-0d7300028e05b0b0a8f5314ed6fc51fc14b76684.tar.bz2
mpv-0d7300028e05b0b0a8f5314ed6fc51fc14b76684.tar.xz
Use pkg-config to detect theora dependencies.
patch by j -- at -- thing -- dot -- net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16661 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 6 insertions, 4 deletions
diff --git a/configure b/configure
index 4a82064f28..25cabddb66 100755
--- a/configure
+++ b/configure
@@ -5286,10 +5286,11 @@ elif test "$_vorbis" = yes -a "$_tremor" = yes ; then
fi
echores "$_vorbis"
-echocheck "OggTheora support (only the CVS version!)"
+echocheck "OggTheora support"
if test "$_theora" = auto ; then
_theora=no
- cat > $TMPC << EOF
+ if ( pkg-config --exists 'theora' ) >> "$TMPLOG" 2>&1 ; then
+ cat > $TMPC << EOF
#include <theora/theora.h>
#include <string.h>
int main(void)
@@ -5323,12 +5324,13 @@ int main(void)
return 0;
}
EOF
- cc_check -ltheora -logg $_ld_lm && _theora=yes
+ cc_check `pkg-config --libs --cflags theora` && _theora=yes
+ fi
fi
if test "$_theora" = yes ; then
_def_theora='#define HAVE_OGGTHEORA 1'
_codecmodules="libtheora $_codecmodules"
- _ld_theora="-ltheora -logg"
+ _ld_theora=`pkg-config --libs --cflags theora`
else
_def_theora='#undef HAVE_OGGTHEORA'
_nocodecmodules="libtheora $_nocodecmodules"