adam
/
darkice
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* temporary workaround for libfaac and libaacplus 

* removed unneeded define (_FFTW3)
* compatible with libaacplus-1.0.1, re #2
This commit is contained in:
tipok 2008-11-06 16:15:19 +00:00
parent d606610431
commit c6ef59c913
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
darkice/branches/darkice-aacp/configure.in
View File

@ -165,6 +165,9 @@ AC_ARG_WITH(aacplus-prefix,
CONFIG_AACPLUS_PREFIX="${withval}", CONFIG_AACPLUS_PREFIX="/usr") CONFIG_AACPLUS_PREFIX="${withval}", CONFIG_AACPLUS_PREFIX="/usr")
if test "x${USE_AACPLUS}" = "xyes" ; then if test "x${USE_AACPLUS}" = "xyes" ; then
if test "x${FAAC_LIB_LOC}" != "x" ; then
AC_MSG_ERROR( [compliling with faac and aacplus is not supported yet, please disable faac by "--without-faac"] )
fi
AC_MSG_CHECKING( [for aacplus library at ${CONFIG_AACPLUS_PREFIX}] ) AC_MSG_CHECKING( [for aacplus library at ${CONFIG_AACPLUS_PREFIX}] )
LA_SEARCH_LIB( AACPLUS_LIB_LOC, AACPLUS_INC_LOC, libaacplus.a libaacplus.so, sbr_main.h, LA_SEARCH_LIB( AACPLUS_LIB_LOC, AACPLUS_INC_LOC, libaacplus.a libaacplus.so, sbr_main.h,
${CONFIG_AACPLUS_PREFIX}) ${CONFIG_AACPLUS_PREFIX})
@ -174,8 +177,6 @@ if test "x${USE_AACPLUS}" = "xyes" ; then
AACPLUS_INCFLAGS="-I${AACPLUS_INC_LOC}" AACPLUS_INCFLAGS="-I${AACPLUS_INC_LOC}"
fi fi
AACPLUS_LDFLAGS="-L${AACPLUS_LIB_LOC} -laacplus" AACPLUS_LDFLAGS="-L${AACPLUS_LIB_LOC} -laacplus"
# TODO: we have to define _FFTW3 only if libaacplus builded with fftw3f
AC_DEFINE( _FFTW3, 1, [libaacplus have to be builded with fftw3f library] )
AC_MSG_RESULT( [found at ${CONFIG_AACPLUS_PREFIX}] ) AC_MSG_RESULT( [found at ${CONFIG_AACPLUS_PREFIX}] )
else else
AC_MSG_WARN( [not found, building without aacplus]) AC_MSG_WARN( [not found, building without aacplus])