2008-11-21 15:32:43 +01:00
|
|
|
--- vorbis.m4
|
|
|
|
|
+++ vorbis.m4
|
2007-01-16 00:23:30 +01:00
|
|
|
@@ -19,7 +19,7 @@
|
|
|
|
|
VORBIS_LIBS="-L$vorbis_libraries"
|
|
|
|
|
elif test "x$vorbis_prefix" != "x" ; then
|
|
|
|
|
VORBIS_LIBS="-L$vorbis_prefix/lib"
|
|
|
|
|
- elif test "x$prefix" != "xNONE"; then
|
2008-11-21 15:32:43 +01:00
|
|
|
+ elif test "x$prefix" != "xNONE" -a "x$prefix" != "x/usr"; then
|
2007-01-16 00:23:30 +01:00
|
|
|
VORBIS_LIBS="-L$prefix/lib"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
@@ -31,7 +31,7 @@
|
|
|
|
|
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"; then
|
|
|
|
|
VORBIS_CFLAGS="-I$prefix/include"
|
|
|
|
|
fi
|
|
|
|
|
|
