changelog.html : Added entries about RICE2 residue coding method.

[platform/upstream/flac.git] / src / libFLAC / libFLAC.m4

diff --git a/src/libFLAC/libFLAC.m4 b/src/libFLAC/libFLAC.m4
index 3621b5b..da7354e 100644 (file)
--- a/src/libFLAC/libFLAC.m4
+++ b/src/libFLAC/libFLAC.m4
@@ -2,9 +2,9 @@
 # "Inspired" by ogg.m4
 
 dnl AM_PATH_LIBFLAC([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libFLAC, and define LIBFLAC_CFLAGS and LIBFLAC_LIBS
+dnl Test for libFLAC, and define LIBFLAC_CFLAGS, LIBFLAC_LIBS, LIBFLAC_LIBDIR
 dnl
-AC_DEFUN(AM_PATH_LIBFLAC,
+AC_DEFUN([AM_PATH_LIBFLAC],
 [dnl 
 dnl Get the cflags and libraries
 dnl
@@ -15,20 +15,24 @@ AC_ARG_ENABLE(libFLACtest, [  --disable-libFLACtest       Do not try to compile
 
   if test "x$libFLAC_libraries" != "x" ; then
     LIBFLAC_LIBS="-L$libFLAC_libraries"
+  elif test "x$libFLAC_prefix" = "xno" || test "x$libFLAC_prefix" = "xyes" ; then
+    LIBFLAC_LIBS=""
   elif test "x$libFLAC_prefix" != "x" ; then
     LIBFLAC_LIBS="-L$libFLAC_prefix/lib"
-  elif test "x$prefix" != "xNONE" ; then
+  elif test "x$prefix" != "xNONE"; then
     LIBFLAC_LIBS="-L$prefix/lib"
   fi
 
-  LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC"
+  if test "x$libFLAC_prefix" != "xno" ; then
+    LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC $OGG_LIBS -lm"
+  fi
 
   if test "x$libFLAC_includes" != "x" ; then
     LIBFLAC_CFLAGS="-I$libFLAC_includes"
   elif test "x$libFLAC_prefix" != "x" ; then
     LIBFLAC_CFLAGS="-I$libFLAC_prefix/include"
   elif test "$prefix" != "xNONE"; then
-    LIBFLAC_CFLAGS="-I$prefix/include"
+    LIBFLAC_CFLAGS=""
   fi
 
   AC_MSG_CHECKING(for libFLAC)
@@ -37,9 +41,13 @@ AC_ARG_ENABLE(libFLACtest, [  --disable-libFLACtest       Do not try to compile
 
   if test "x$enable_libFLACtest" = "xyes" ; then
     ac_save_CFLAGS="$CFLAGS"
+    ac_save_CXXFLAGS="$CXXFLAGS"
     ac_save_LIBS="$LIBS"
+    ac_save_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
     CFLAGS="$CFLAGS $LIBFLAC_CFLAGS"
+    CXXFLAGS="$CXXFLAGS $LIBFLAC_CFLAGS"
     LIBS="$LIBS $LIBFLAC_LIBS"
+    LD_LIBRARY_PATH="$LIBFLAC_LIBDIR:$LD_LIBRARY_PATH"
 dnl
 dnl Now check if the installed libFLAC is sufficiently new.
 dnl
@@ -58,7 +66,9 @@ int main ()
 
 ],, no_libFLAC=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
        CFLAGS="$ac_save_CFLAGS"
+       CXXFLAGS="$ac_save_CXXFLAGS"
        LIBS="$ac_save_LIBS"
+       LD_LIBRARY_PATH="$ac_save_LD_LIBRARY_PATH"
   fi
 
   if test "x$no_libFLAC" = "x" ; then
@@ -71,7 +81,9 @@ int main ()
      else
        echo "*** Could not run libFLAC test program, checking why..."
        CFLAGS="$CFLAGS $LIBFLAC_CFLAGS"
+       CXXFLAGS="$CXXFLAGS $LIBFLAC_CFLAGS"
        LIBS="$LIBS $LIBFLAC_LIBS"
+       LD_LIBRARY_PATH="$LIBFLAC_LIBDIR:$LD_LIBRARY_PATH"
        AC_TRY_LINK([
 #include <stdio.h>
 #include <FLAC/format.h>
@@ -90,13 +102,17 @@ int main ()
        echo "*** or that you have moved libFLAC since it was installed. In the latter case, you"
        echo "*** may want to edit the libFLAC-config script: $LIBFLAC_CONFIG" ])
        CFLAGS="$ac_save_CFLAGS"
+       CXXFLAGS="$ac_save_CXXFLAGS"
        LIBS="$ac_save_LIBS"
+       LD_LIBRARY_PATH="$ac_save_LD_LIBRARY_PATH"
      fi
      LIBFLAC_CFLAGS=""
+     LIBFLAC_LIBDIR=""
      LIBFLAC_LIBS=""
      ifelse([$2], , :, [$2])
   fi
   AC_SUBST(LIBFLAC_CFLAGS)
+  AC_SUBST(LIBFLAC_LIBDIR)
   AC_SUBST(LIBFLAC_LIBS)
   rm -f conf.libFLACtest
 ])