# HG changeset patch
# User yaz
# Date 1164080710 28800
# Node ID b8482261841d3974c91896420e59caa0b0acddf1
# Parent  6612ede1b9340714dab1b880c7bb25030f0826cc
[svn] - revise CXXFLAGS fix.

diff -r 6612ede1b934 -r b8482261841d ChangeLog
--- a/ChangeLog	Mon Nov 20 19:41:23 2006 -0800
+++ b/ChangeLog	Mon Nov 20 19:45:10 2006 -0800
@@ -1,3 +1,11 @@
+2006-11-21 03:41:23 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [608]
+  - fix flac113 crashes at startup time.
+  
+  trunk/src/flac113/plugin.c |    2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+
+
 2006-11-21 02:24:07 +0000  William Pitcock <nenolod@nenolod.net>
   revision [604]
   - wavpack/wputils.h is deprecated, wavpack/wavpack.h should be used instead.
diff -r 6612ede1b934 -r b8482261841d m4/libFLAC.m4
--- a/m4/libFLAC.m4	Mon Nov 20 19:41:23 2006 -0800
+++ b/m4/libFLAC.m4	Mon Nov 20 19:45:10 2006 -0800
@@ -24,12 +24,14 @@
 
   LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -logg -lm"
 
+  if test "x$prefix" != "xNONE"; then
+    LIBFLAC_CFLAGS="-I$prefix/include"
+  fi
+
   if test "x$libFLAC_includes" != "x" ; then
-    LIBFLAC_CFLAGS="-I$prefix/include -I$libFLAC_includes"
+    LIBFLAC_CFLAGS="$LIBFLAC_CFLAGS -I$libFLAC_includes"
   elif test "x$libFLAC_prefix" != "x" ; then
-    LIBFLAC_CFLAGS="-I$prefix/include -I$libFLAC_prefix/include"
-  elif test "x$prefix" != "xNONE"; then
-    LIBFLAC_CFLAGS="-I$prefix/include"
+    LIBFLAC_CFLAGS="$LIBFLAC_CFLAGS -I$libFLAC_prefix/include"
   fi
 
   AC_MSG_CHECKING(for libFLAC >= 1.1.2)