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)
This commit is contained in:
parent
42c22d5f00
commit
8403c2a84b
12
configure.in
12
configure.in
@ -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])
|
||||
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
|
||||
OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -DDEBUG"
|
||||
CPPFLAGS="-DDEBUG $CPPFLAGS"
|
||||
CFLAGS="-g $CFLAGS"
|
||||
else
|
||||
OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -DNDEBUG"
|
||||
CPPFLAGS="-DNDEBUG $CPPFLAGS"
|
||||
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
|
||||
CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS"
|
||||
CXXFLAGS="$OUR_CFLAGS_HEAD $CXXFLAGS"
|
||||
|
||||
#@@@
|
||||
AM_CONDITIONAL(FLaC__HAS_AS__TEMPORARILY_DISABLED, test "yes" = "no")
|
||||
|
@ -98,6 +98,7 @@
|
||||
build system:
|
||||
<ul>
|
||||
<li>Fixed bug compiling <span class="commandname">flac</span> without Ogg support (<a href="https://sourceforge.net/tracker/index.php?func=detail&aid=1760786&group_id=13478&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&aid=1763690&group_id=13478&atid=113478">SF #1763690</a>).</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li>
|
||||
|
Loading…
Reference in New Issue
Block a user