Merge remote-tracking branch 'remotes/origin/upstream' into tizen

Change-Id: I258d58f7d02f8d0c9da99204a82e283d234406ec

diff --cc configure.ac
index c16f46d,ef14780..90366f9
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -308,8 -301,13 +301,13 @@@ m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALL
  
  if test -n "$PKG_CONFIG" ; then
        if test x$enable_external_libs = xno ; then
 -              AC_MSG_WARN([[*** External libs (FLAC, Ogg, Vorbis) disabled. ***]])
 +              AC_MSG_WARN([[*** External libs (Ogg, Vorbis) disabled. ***]])
        else
+               PKG_CHECK_MOD_VERSION(FLAC, flac >= 1.3.1, ac_cv_flac=yes, ac_cv_flac=no)
+ 
+               # Make sure the FLAC_CFLAGS value is sane.
+               FLAC_CFLAGS=`echo $FLAC_CFLAGS | $SED "s|include/FLAC|include|"`
+ 
                PKG_CHECK_MOD_VERSION(OGG, ogg >= 1.1.3, ac_cv_ogg=yes, ac_cv_ogg=no)
  
                if test x$enable_experimental = xyes ; then
@@@ -331,11 -329,11 +329,11 @@@
                HAVE_EXTERNAL_LIBS=1
                enable_external_libs=yes
  
-               EXTERNAL_CFLAGS="$OGG_CFLAGS $VORBISENC_CFLAGS $SPEEX_CFLAGS"
-               EXTERNAL_LIBS="$VORBISENC_LIBS $SPEEX_LIBS"
+               EXTERNAL_CFLAGS="$FLAC_CFLAGS $OGG_CFLAGS $VORBIS_CFLAGS $VORBISENC_CFLAGS $SPEEX_CFLAGS"
+               EXTERNAL_LIBS="$FLAC_LIBS $OGG_LIBS $VORBIS_LIBS $VORBISENC_LIBS $SPEEX_LIBS "
        else
                echo
 -              AC_MSG_WARN([[*** One or more of the external libraries (ie libflac, libogg and]])
 +              AC_MSG_WARN([[*** One or more of the external libraries (ie libogg and]])
                AC_MSG_WARN([[*** libvorbis) is either missing (possibly only the development]])
                AC_MSG_WARN([[*** headers) or is of an unsupported version.]])
                AC_MSG_WARN([[***]])

diff --cc src/file_io.c
Simple merge

diff --cc src/flac.c
Simple merge