[MPlayer-cvslog] r30269 - trunk/configure

[reimar]

Author: reimar
Date: Sun Jan 10 21:32:19 2010
New Revision: 30269

Log:
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.

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Sun Jan 10 20:59:36 2010	(r30268)
+++ trunk/configure	Sun Jan 10 21:32:19 2010	(r30269)
@@ -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_liba
 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