Same prefix fix as before.

svn path=/trunk/vorbis/; revision=1900

diff --git a/acinclude.m4 b/acinclude.m4
index 73e41bd..972757b 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,7 +1,6 @@
 # acinclude.m4
 # all .m4 files needed that might not be installed go here
 
-# ogg.m4
 # Configure paths for libogg
 # Jack Moffitt <jack@icecast.org> 10-21-2000
 # Shamelessly stolen from Owen Taylor and Manish Singh
@@ -16,11 +15,11 @@ dnl
 AC_ARG_WITH(ogg-prefix,[  --with-ogg-prefix=PFX   Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="")
 AC_ARG_ENABLE(oggtest, [  --disable-oggtest       Do not try to compile and run a test Ogg program],, enable_oggtest=yes)
 
-  if test "x$ogg_prefix" != "xNONE" ; then
+  if test "x$ogg_prefix" != "x"; then
     ogg_args="$ogg_args --prefix=$ogg_prefix"
     OGG_CFLAGS="-I$ogg_prefix/include"
     OGG_LIBS="-L$ogg_prefix/lib"
-  elif test "$prefix" != ""; then
+  elif test "x$prefix" != "xNONE"; then
     ogg_args="$ogg_args --prefix=$prefix"
     OGG_CFLAGS="-I$prefix/include"
     OGG_LIBS="-L$prefix/lib"

diff --git a/vorbis.m4 b/vorbis.m4
index 1c0d846..09a860b 100644 (file)
--- a/vorbis.m4
+++ b/vorbis.m4
@@ -12,11 +12,11 @@ dnl
 AC_ARG_WITH(vorbis-prefix,[  --with-vorbis-prefix=PFX   Prefix where libvorbis is installed (optional)], vorbis_prefix="$withval", vorbis_prefix="")
 AC_ARG_ENABLE(vorbistest, [  --disable-vorbistest       Do not try to compile and run a test Vorbis program],, enable_vorbistest=yes)
 
-  if test "x$vorbis_prefix" != "xNONE" ; then
+  if test "x$vorbis_prefix" != "x" ; then
     vorbis_args="$vorbis_args --prefix=$vorbis_prefix"
     VORBIS_CFLAGS="-I$vorbis_prefix/include"
     VORBIS_LIBDIR="-L$vorbis_prefix/lib"
-  elif test "$prefix" != ""; then
+  elif test "x$prefix" != "xNONE"; then
     vorbis_args="$vorbis_args --prefix=$prefix"
     VORBIS_CFLAGS="-I$prefix/include"
     VORBIS_LIBDIR="-L$prefix/lib"