libogg/m4.diff

30 lines
799 B
Diff

--- ogg.m4-dist 2003-03-08 03:44:29.000000000 +0100
+++ ogg.m4 2004-01-09 16:50:52.000000000 +0100
@@ -18,7 +18,7 @@
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"; then
OGG_LIBS="-L$prefix/lib"
fi
@@ -28,7 +28,7 @@
OGG_CFLAGS="-I$ogg_includes"
elif test "x$ogg_prefix" != "x" ; then
OGG_CFLAGS="-I$ogg_prefix/include"
- elif test "x$prefix" != "xNONE"; then
+ elif test "x$prefix" != "xNONE" -a "x$prefix" != "x/usr"; then
OGG_CFLAGS="-I$prefix/include"
fi
@@ -51,7 +51,7 @@
#include <string.h>
#include <ogg/ogg.h>
-int main ()
+int main (void)
{
system("touch conf.oggtest");
return 0;