[MPlayer-dev-eng] [PATCH] make configure use the right faad.h

[Björn Sandell]

On Wed, 29 Oct 2003 03:11:53 +0100
Diego Biurrun <diego at biurrun.de> wrote:

> 
> 
> James Bilotto writes:
>  > > i'm sorry to say that it dose not work for me with your patch, but i think
>  > > i know why. i will send a patch to your patch soon.
>  > 
>  > with this patch it now works for me
> 
> What exactly is the problem you are having? 

My problem is that I need --with-extraincdir=/usr/local/include as most
goodies are installed there and then

Checking for faad2 (AAC) support ... yes (internal)
Checking for faad2 version ... 1.1

If we take a look in confiure we see that when we check for faad we use
(basically) "$_cc $_inc_faad $_inc_extra" but when we check the faad version
we use "cc_check $_inc_faad" which find and uses /usr/local/include/faad.h
A quick fix could be something like:

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.797
diff -u -r1.797 configure
--- configure   27 Oct 2003 01:06:35 -0000      1.797
+++ configure   29 Oct 2003 19:47:09 -0000
@@ -4474,7 +4475,7 @@
   return 0;
 }
 EOF
-  if cc_check $_inc_faad $_ld_faad -lm && "$TMPO" >> "$TMPLOG" ; then
+  if ($_cc $_inc_faad $_inc_extra $_ld_faad -lm "$TMPC" -o "$TMPO") && "$TMPO" 
>> "$TMPLOG" ; then
     _faad_version=`"$TMPO"`
     _faad_tempversion=`"$TMPO" | sed -e 's/^\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*/
\1\2/'`
     _def_faad_version="#define FAADVERSION $_faad_tempversion"


-- 
Björn Sandell       DCE/DFS Sysadmin       IT department
Chalmers University of Technology    www.dce.chalmers.se