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/vorbis/; revision=1374

diff --git a/vorbis.m4 b/vorbis.m4
index 0cc4c3c..7ce9600 100644 (file)
--- a/vorbis.m4
+++ b/vorbis.m4
@@ -16,6 +16,10 @@ AC_ARG_ENABLE(vorbistest, [  --disable-vorbistest       Do not try to compile an
     vorbis_args="$vorbis_args --prefix=$vorbis_prefix"
     VORBIS_CFLAGS="-I$vorbis_prefix/include"
     VORBIS_LIBDIR="-L$vorbis_prefix/lib"
+  elif test "$prefix" != ""; then
+    vorbis_args="$vorbis_args --prefix=$prefix"
+    VORBIS_CFLAGS="-I$prefix/include"
+    VORBIS_LIBDIR="-L$prefix/lib"
   fi
 
   VORBIS_LIBS="$VORBIS_LIBDIR -lvorbis -lm"