Mercurial > mplayer.hg
comparison configure @ 35831:acc4ff4f279c
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 |
comparison
equal
deleted
inserted
replaced
| 35830:52f1a3aea26b | 35831:acc4ff4f279c |
|---|---|
| 3913 _iconv=yes && break | 3913 _iconv=yes && break |
| 3914 done | 3914 done |
| 3915 fi | 3915 fi |
| 3916 if test "$_iconv" = yes ; then | 3916 if test "$_iconv" = yes ; then |
| 3917 def_iconv='#define CONFIG_ICONV 1' | 3917 def_iconv='#define CONFIG_ICONV 1' |
| 3918 def_have_iconv='#define HAVE_ICONV 1' | |
| 3919 else | 3918 else |
| 3920 def_iconv='#undef CONFIG_ICONV' | 3919 def_iconv='#undef CONFIG_ICONV' |
| 3921 def_have_iconv='#define HAVE_ICONV 0' | |
| 3922 fi | 3920 fi |
| 3923 echores "$_iconv" | 3921 echores "$_iconv" |
| 3924 | 3922 |
| 3925 | 3923 |
| 3926 echocheck "soundcard.h" | 3924 echocheck "soundcard.h" |
| 8535 CONFIG_AC3DSP = yes | 8533 CONFIG_AC3DSP = yes |
| 8536 CONFIG_BZLIB = $bzlib | 8534 CONFIG_BZLIB = $bzlib |
| 8537 CONFIG_CRYSTALHD= $crystalhd | 8535 CONFIG_CRYSTALHD= $crystalhd |
| 8538 CONFIG_ENCODERS = yes | 8536 CONFIG_ENCODERS = yes |
| 8539 CONFIG_GPL = yes | 8537 CONFIG_GPL = yes |
| 8538 CONFIG_ICONV = $_iconv | |
| 8540 CONFIG_MLIB = $_mlib | 8539 CONFIG_MLIB = $_mlib |
| 8541 CONFIG_MPEGAUDIO=yes | 8540 CONFIG_MPEGAUDIO=yes |
| 8542 CONFIG_MUXERS = yes | 8541 CONFIG_MUXERS = yes |
| 8543 CONFIG_NETWORK = $networking | 8542 CONFIG_NETWORK = $networking |
| 8544 CONFIG_RTPDEC = $networking | 8543 CONFIG_RTPDEC = $networking |
| 8688 $def_dl | 8687 $def_dl |
| 8689 $def_dos_paths | 8688 $def_dos_paths |
| 8690 $def_extern_asm | 8689 $def_extern_asm |
| 8691 $def_extern_prefix | 8690 $def_extern_prefix |
| 8692 $def_iconv | 8691 $def_iconv |
| 8693 $def_have_iconv | |
| 8694 $def_kstat | 8692 $def_kstat |
| 8695 $def_macosx_bundle | 8693 $def_macosx_bundle |
| 8696 $def_macosx_finder | 8694 $def_macosx_finder |
| 8697 $def_maemo | 8695 $def_maemo |
| 8698 $def_memalign_hack | 8696 $def_memalign_hack |