From 6ded764a8826a30ab880f9a974f2c8d6ed9edf70 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Thu, 10 Jul 2003 01:48:58 +0000 Subject: [PATCH] make sure the ogg and vorbis checks don't add /usr/{include,lib> or /usr/local/{include,lib} to CFLAGS or LDFLAGS --- acinclude.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index ae2f2537c..3e17d05c5 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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