Commit 6e7e4225 authored by Brendan Cully 's avatar Brendan Cully

Pay attention to $ao_prefix = "yes" and "no" (closes #283)

Really a five line diff but I had to reindent everything because it's all
wrappen in a new conditional.

svn path=/trunk/vorbis-tools/; revision=4277
parent 32c99c82
......@@ -235,10 +235,11 @@ AC_ARG_WITH(ao-libraries,[ --with-ao-libraries=DIR Directory where libao libr
AC_ARG_WITH(ao-includes,[ --with-ao-includes=DIR Directory where libao header files are installed (optional)], ao_includes="$withval", ao_includes="")
AC_ARG_ENABLE(aotest, [ --disable-aotest Do not try to compile and run a test ao program],, enable_aotest=yes)
if test "x$ao_prefix" != "xno"
then
if test "x$ao_libraries" != "x" ; then
AO_LIBS="-L$ao_libraries"
elif test "x$ao_prefix" != "x"; then
elif test "x$ao_prefix" != "x" -a "x$ao_prefix" != "xyes"; then
AO_LIBS="-L$ao_prefix/lib"
elif test "x$prefix" != "xNONE"; then
AO_LIBS="-L$prefix/lib"
......@@ -246,7 +247,7 @@ AC_ARG_ENABLE(aotest, [ --disable-aotest Do not try to compile and run a
if test "x$ao_includes" != "x" ; then
AO_CFLAGS="-I$ao_includes"
elif test "x$ao_prefix" != "x"; then
elif test "x$ao_prefix" != "x" -a "x$ao_prefix" != "xyes"; then
AO_CFLAGS="-I$ao_prefix/include"
elif test "x$prefix" != "xNONE"; then
AO_CFLAGS="-I$prefix/include"
......@@ -329,6 +330,7 @@ int main ()
AC_SUBST(AO_CFLAGS)
AC_SUBST(AO_LIBS)
rm -f conf.aotest
fi
])
dnl This macros shamelessly stolen from
......
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