Mercurial > mplayer.hg

diff configure @ 35831:acc4ff4f279c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: fix build after moving from HAVE_ICONV to CONFIG_ICONV in FFmpeg. This reverts r35916 (and add the necessary .mak yes/no definition).
author cboesch
date Thu, 28 Feb 2013 00:40:48 +0000
parents 88a9862c25e6
children 7c37b17a64a5
line wrap: on
line diff
--- a/configure	Mon Feb 25 21:44:59 2013 +0000
+++ b/configure	Thu Feb 28 00:40:48 2013 +0000
@@ -3915,10 +3915,8 @@
 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_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_extern_asm
 $def_extern_prefix
 $def_iconv
-$def_have_iconv
 $def_kstat
 $def_macosx_bundle
 $def_macosx_finder