Commit 7fdb551f authored by jsquyres's avatar jsquyres

Missed these ones the first time through: apply the same patch that has

been put in all the relevant acinclude.m4 files to the .m4 files that
get installed with the libraries.

Another patch for lazy people (like me).

Make AM_PATH_OGG, AM_PATH_VORBIS, and AM_PATH_AO each a bit smarter.
Each of the three will now also check the $prefix for the location
of their respective libraries/header files.  This means that if you're
compiling all 4 things (ao, ogg, vorbis, vorbis-tools) all with the
same $prefix (which is a pretty common case), you don't have to specify
"--with-ao-prefix=this --with-ogg-prefix=really --with-vorbis-prefix=sucks",
you can just specify a single --prefix argument and ditch all the
--with-*-prefix arguments.

However, if you do specify any of the three --with arguments, those are
searched *first* -- the $prefix is searched second.

svn path=/trunk/ogg/; revision=1374
parent 6ed2fa1f
......@@ -16,6 +16,10 @@ AC_ARG_ENABLE(oggtest, [ --disable-oggtest Do not try to compile and run
ogg_args="$ogg_args --prefix=$ogg_prefix"
OGG_CFLAGS="-I$ogg_prefix/include"
OGG_LIBS="-L$ogg_prefix/lib"
elif test "$prefix" != ""; then
ogg_args="$ogg_args --prefix=$prefix"
OGG_CFLAGS="-I$prefix/include"
OGG_LIBS="-L$prefix/lib"
fi
OGG_LIBS="$OGG_LIBS -logg"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment