Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-15 15:49:36 +02:00
Code Issues Releases Wiki Activity

Move LAME header file from src/include to lib-src/lame/lame.

Browse Source 
The LAME header file is part of the upstream LAME project and does
not belong in the src/ tree of Audacity.
This commit is contained in:
benjamin.drung@gmail.com 2013-11-11 13:48:56 +00:00
parent 6dcffdc827
commit f0b2b26e0b
4 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
configure vendored
View File

@ -6067,7 +6067,38 @@ $as_echo "$as_me: LAME library is NOT available as system library." >&6;}
fi
LAME_LOCAL_AVAILABLE="yes"
as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lame/lame/lame.h" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lame/lame/lame.h" >&5
$as_echo_n "checking for ${srcdir}/lib-src/lame/lame/lame.h... " >&6; }
if eval \${$as_ac_File+:} false; then :
$as_echo_n "(cached) " >&6
else
test "$cross_compiling" = yes &&
as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
if test -r "${srcdir}/lib-src/lame/lame/lame.h"; then
eval "$as_ac_File=yes"
else
eval "$as_ac_File=no"
fi
fi
eval ac_res=\$$as_ac_File
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
LAME_LOCAL_AVAILABLE="yes"
else
LAME_LOCAL_AVAILABLE="no"
fi
if test "$LAME_LOCAL_AVAILABLE" = "yes"; then
LAME_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/lame'
{ $as_echo "$as_me:${as_lineno-$LINENO}: LAME headers are available in this source tree." >&5
$as_echo "$as_me: LAME headers are available in this source tree." >&6;}
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: LAME headers are NOT available in this source tree." >&5
$as_echo "$as_me: LAME headers are NOT available in this source tree." >&6;}
fi

0
src/include/lame.h → lib-src/lame/lame/lame.h
View File

11
m4/audacity_checklib_lame.m4
View File

@ -44,5 +44,14 @@ AC_DEFUN([AUDACITY_CHECKLIB_LAME], [
dnl see if LAME is available in the source dir
LAME_LOCAL_AVAILABLE="yes"
AC_CHECK_FILE(${srcdir}/lib-src/lame/lame/lame.h,
LAME_LOCAL_AVAILABLE="yes",
LAME_LOCAL_AVAILABLE="no")
if test "$LAME_LOCAL_AVAILABLE" = "yes"; then
LAME_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/lame'
AC_MSG_NOTICE([LAME headers are available in this source tree.])
else
AC_MSG_NOTICE([LAME headers are NOT available in this source tree.])
fi
])

4
src/export/ExportMP3.cpp
View File

@ -91,11 +91,7 @@
#include "Export.h"
#include "ExportMP3.h"
#if defined(DISABLE_DYNAMIC_LOADING_LAME)
#include <lame/lame.h>
#else
#include "lame.h"
#endif
#ifdef USE_LIBID3TAG
#include <id3tag.h>