From 4ecd4741e61e4ba6e9c1a0659a7978c498cc0d5a Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 10 Jan 2010 20:32:19 +0000 Subject: FFmpeg uses ifdef in Makefiles for CONFIG_MPEGAUDIO_HP and CONFIG_HARDCODED_TABLES. Change the config.mak generation to take that into account and not generate a definition for these if the features are disabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30269 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 1ef69d4bc1..0a4bfd2487 100755 --- a/configure +++ b/configure @@ -3351,6 +3351,7 @@ echores "$_fastmemcpy" echocheck "hard-coded tables" if test "$hardcoded_tables" = yes ; then def_hardcoded_tables='#define CONFIG_HARDCODED_TABLES 1' + mak_hardcoded_tables='CONFIG_HARDCODED_TABLES = yes' else def_hardcoded_tables='#define CONFIG_HARDCODED_TABLES 0' fi @@ -7112,7 +7113,8 @@ test "$_libavcodec" = yes && def_libavcodec='#define CONFIG_LIBAVCODEC 1' test "$_libavcodec_a" = yes && def_libavcodec_a='#define CONFIG_LIBAVCODEC_A 1' test "$_libavcodec_so" = yes && def_libavcodec_so='#define CONFIG_LIBAVCODEC_SO 1' test "$_libavcodec_mpegaudio_hp" = yes \ - && def_libavcodec_mpegaudio_hp='#define CONFIG_MPEGAUDIO_HP 1' + && def_libavcodec_mpegaudio_hp='#define CONFIG_MPEGAUDIO_HP 1' \ + && mak_libavcodec_mpegaudio_hp='CONFIG_MPEGAUDIO_HP = yes' if test "$_libavcodec_a" = yes ; then _codecmodules="libavcodec(internal) $_codecmodules" elif test "$_libavcodec_so" = yes ; then @@ -8376,7 +8378,8 @@ FAAC=$_faac FAAD = $_faad FAAD_INTERNAL = $_faad_internal FASTMEMCPY = $_fastmemcpy -CONFIG_HARDCODED_TABLES = $hardcoded_tables +$mak_hardcoded_tables +$mak_libavcodec_mpegaudio_hp FBDEV = $_fbdev FREETYPE = $_freetype FTP = $_ftp -- cgit v1.2.3