Commit 8403c2a8 authored by Josh Coalson's avatar Josh Coalson
Browse files

fix bug where sometimes an existing installation of flac could interfere with...

fix bug where sometimes an existing installation of flac could interfere with the build process (SF#1763690: https://sourceforge.net/tracker/index.php?func=detail&aid=1763690&group_id=13478&atid=113478)
parent 42c22d5f
...@@ -274,17 +274,17 @@ AC_DEFINE(FLAC__HAS_GAS) ...@@ -274,17 +274,17 @@ AC_DEFINE(FLAC__HAS_GAS)
AH_TEMPLATE(FLAC__HAS_GAS, [define if you are compiling for PowerPC and have the 'gas' assembler]) AH_TEMPLATE(FLAC__HAS_GAS, [define if you are compiling for PowerPC and have the 'gas' assembler])
fi fi
OUR_CFLAGS_HEAD='-I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include' CPPFLAGS='-I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include'" $CPPFLAGS"
if test "x$debug" = xtrue; then if test "x$debug" = xtrue; then
OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -DDEBUG" CPPFLAGS="-DDEBUG $CPPFLAGS"
CFLAGS="-g $CFLAGS"
else else
OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -DNDEBUG" CPPFLAGS="-DNDEBUG $CPPFLAGS"
if test "x$GCC" = xyes; then if test "x$GCC" = xyes; then
OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__" CPPFLAGS="-DFLaC__INLINE=__inline__ $CPPFLAGS"
CFLAGS="-O3 -funroll-loops -finline-functions -Wall -W -Winline $CFLAGS"
fi fi
fi fi
CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS"
CXXFLAGS="$OUR_CFLAGS_HEAD $CXXFLAGS"
#@@@ #@@@
AM_CONDITIONAL(FLaC__HAS_AS__TEMPORARILY_DISABLED, test "yes" = "no") AM_CONDITIONAL(FLaC__HAS_AS__TEMPORARILY_DISABLED, test "yes" = "no")
......
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
build system: build system:
<ul> <ul>
<li>Fixed bug compiling <span class="commandname">flac</span> without Ogg support (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1760786&amp;group_id=13478&amp;atid=113478">SF #1760786</a>).</li> <li>Fixed bug compiling <span class="commandname">flac</span> without Ogg support (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1760786&amp;group_id=13478&amp;atid=113478">SF #1760786</a>).</li>
<li>Fixed bug where sometimes an existing installation of flac could interfere with the build process (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1763690&amp;group_id=13478&amp;atid=113478">SF #1763690</a>).</li>
</ul> </ul>
</li> </li>
<li> <li>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment