[FFmpeg-devel] [PATCH] create all pkg-config files in their own subdirectory

[Aurelien Jacobs]

Diego Biurrun wrote:

> On Mon, Jul 07, 2008 at 02:12:24PM +0200, Aurelien Jacobs wrote:
> > Diego Biurrun wrote:
> > 
> > > On Sun, Jul 06, 2008 at 10:53:00PM +0200, Aurelien Jacobs wrote:
> > > > M?ns Rullg?rd wrote:
> > > > 
> > > > > Jack Jansen <Jack.Jansen at cwi.nl> writes:
> > > > > 
> > > > > > On  28-Jun-2008, at 03:09 , M?ns Rullg?rd wrote:
> > > > > >
> > > > > >>> -libdir=\${pcfiledir}/$name
> > > > > >>> +libdir=\${pcfiledir}
> > > > > >>
> > > > > >> If that is right, ...
> > > > > >>
> > > > > >>> includedir=\${pcfiledir}
> > > > > >>
> > > > > >> then that is wrong.
> > > > > >
> > > > > > No: the pattern seems to be to do
> > > > > >
> > > > > > 	#include "libavcodec/avcodec.h"
> > > > > >
> > > > > > currently. That was different in the past, IIRC, but nowadays this is
> > > > > > what most ffmpeg code uses.
> > > > > 
> > > > > Yes, that is how #include directives should look.  Assuming
> > > > > ${pcfiledir} is the directory containing the .pc file, supplying
> > > > > -I${pcfiledir} is wrong when the .pc file is in the same directory as
> > > > > headers/libs.
> > > > 
> > > > True.
> > > > Attached patch should fix this issue properly.
> > > > I will apply it in a few days if no one cares.
> > > > 
> > > > --- configure	(revision 14095)
> > > > +++ configure	(working copy)
> > > > @@ -2212,8 +2212,8 @@
> > > >  cat <<EOF > $name/$name-uninstalled.pc
> > > >  prefix=
> > > >  exec_prefix=
> > > > -libdir=\${pcfiledir}/$name
> > > > -includedir=\${pcfiledir}
> > > > +libdir=\${pcfiledir}
> > > > +includedir=\${pcfiledir}/..
> > > 
> > > This looks wrong to me.  I don't see the problem in our current
> > > pkg-config files...
> > 
> > That's easy.
> > When you instruct pkg-config to use:
> >   $FFMPEG/libavcodec/libavcodec-uninstalled.pc
> > then includedir will point to $FFMPEG/libavcodec and thus, software which
> > #incude "libavcodec/avcodec.h" will fail because $FFMPEG is not in
> > the include path.
> > (same applies to libs and linker)
> 
> OK, I get it.  Apply your patch.

Applied.

Aurel