[MPlayer-cvslog] CVS: main configure,1.1069,1.1070

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv4616

Modified Files:
	configure 
Log Message:
Use pkg-config to detect theora dependencies.
patch by j -- at -- thing -- dot -- net


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1069
retrieving revision 1.1070
diff -u -r1.1069 -r1.1070
--- configure	3 Oct 2005 19:36:32 -0000	1.1069
+++ configure	4 Oct 2005 17:58:11 -0000	1.1070
@@ -5286,10 +5286,11 @@
 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 @@
   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"