make sure the ogg and vorbis checks don't add /usr/{include,lib> or

/usr/local/{include,lib} to CFLAGS or LDFLAGS
This commit is contained in:
Bill Currie 2003-07-10 01:48:58 +00:00
parent dfa16742e2
commit 6ded764a88

View file

@ -423,7 +423,7 @@ AC_ARG_ENABLE(oggtest, [ --disable-oggtest Do not try to compile and run
OGG_LIBS="-L$ogg_libraries"
elif test "x$ogg_prefix" != "x" ; then
OGG_LIBS="-L$ogg_prefix/lib"
elif test "x$prefix" != "xNONE" ; then
elif test "x$prefix" != "xNONE" -a "x$prefix" != "x/usr" -a "x$prefix" != "x/usr/local"; then
OGG_LIBS="-L$prefix/lib"
fi
@ -539,7 +539,7 @@ AC_ARG_ENABLE(vorbistest, [ --disable-vorbistest Do not try to compile an
VORBIS_CFLAGS="-I$vorbis_includes"
elif test "x$vorbis_prefix" != "x" ; then
VORBIS_CFLAGS="-I$vorbis_prefix/include"
elif test "x$prefix" != "xNONE"; then
elif test "x$prefix" != "xNONE" -a "x$prefix" != "x/usr" -a "x$prefix" != "x/usr/local"; then
VORBIS_CFLAGS="-I$prefix/include"
fi