[MPlayer-cvslog] r35925 - trunk/configure

[cboesch]

Author: cboesch
Date: Thu Feb 28 01:40:48 2013
New Revision: 35925

Log:
build: fix build after moving from HAVE_ICONV to CONFIG_ICONV in FFmpeg.

This reverts r35916 (and add the necessary .mak yes/no definition).

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Mon Feb 25 22:44:59 2013	(r35924)
+++ trunk/configure	Thu Feb 28 01:40:48 2013	(r35925)
@@ -3915,10 +3915,8 @@ EOF
 fi
 if test "$_iconv" = yes ; then
   def_iconv='#define CONFIG_ICONV 1'
-  def_have_iconv='#define HAVE_ICONV 1'
 else
   def_iconv='#undef CONFIG_ICONV'
-  def_have_iconv='#define HAVE_ICONV 0'
 fi
 echores "$_iconv"
 
@@ -8537,6 +8535,7 @@ CONFIG_BZLIB    = $bzlib
 CONFIG_CRYSTALHD= $crystalhd
 CONFIG_ENCODERS = yes
 CONFIG_GPL      = yes
+CONFIG_ICONV    = $_iconv
 CONFIG_MLIB     = $_mlib
 CONFIG_MPEGAUDIO=yes
 CONFIG_MUXERS   = yes
@@ -8690,7 +8689,6 @@ $def_dos_paths
 $def_extern_asm
 $def_extern_prefix
 $def_iconv
-$def_have_iconv
 $def_kstat
 $def_macosx_bundle
 $def_macosx_finder