diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 370 |
1 files changed, 187 insertions, 183 deletions
@@ -693,7 +693,7 @@ _ass=auto _rpath=no _asmalign_pot=auto _stream_cache=yes -_def_stream_cache="#define USE_STREAM_CACHE 1" +_def_stream_cache="#define CONFIG_STREAM_CACHE 1" _need_shmem=yes for ac_option do case "$ac_option" in @@ -1398,7 +1398,7 @@ if amigaos ; then _select=no _sighandler=no _stream_cache=no - _def_stream_cache="#undef USE_STREAM_CACHE" + _def_stream_cache="#undef CONFIG_STREAM_CACHE" fi if qnx ; then @@ -1409,9 +1409,6 @@ if os2 ; then _exesuf=".exe" _getch=getch2-os2.c _need_shmem=no - _ar="emxomfar -p256" - _ranlib="echo ignoring ranlib" - _ld_extra="$_ld_extra -Zomf -Zstack 16384 -Zbin-files -Zargs-wild -lmmpm2" fi for I in "$TMPDIR" "$TEMPDIR" "/tmp" ; do @@ -2470,11 +2467,9 @@ EOF # check if the compiler supports braces for vector declarations cat > $TMPC << EOF $inc_altivec_h -#define AVV(x...) {x} -int main(void) { (vector int) AVV(1); return 0; } +int main(void) { (vector int) {1}; return 0; } EOF - cc_check $_altivec_gcc_flags && - _def_altivec_vector_braces='#define HAVE_ALTIVEC_VECTOR_BRACES 1' + cc_check $_altivec_gcc_flags || die "You need a compiler that supports {} in AltiVec vector declarations." # Disable runtime cpudetection if we cannot generate AltiVec code or # AltiVec is disabled by the user. @@ -2603,9 +2598,9 @@ EOF cc_check && _langinfo=yes fi if test "$_langinfo" = yes ; then - _def_langinfo='#define USE_LANGINFO 1' + _def_langinfo='#define CONFIG_LANGINFO 1' else - _def_langinfo='#undef USE_LANGINFO' + _def_langinfo='#undef CONFIG_LANGINFO' fi echores "$_langinfo" @@ -2864,11 +2859,26 @@ EOF echores "$_use_aton" fi -_def_use_aton='#undef USE_ATON' +_def_use_aton='#undef CONFIG_ATON' if test "$_use_aton" = yes; then - _def_use_aton='#define USE_ATON 1' + _def_use_aton='#define CONFIG_ATON 1' fi + +echocheck "socklen_t" +cat > $TMPC << EOF +#include <sys/socket.h> +int main(void) { socklen_t v = 0; return v; } +EOF +cc_check && _socklen_t=yes +if test "$_socklen_t" = yes ; then + _def_socklen_t='#define HAVE_SOCKLEN_T 1' +else + _def_socklen_t='#undef HAVE_SOCKLEN_T' +fi +echores "$_socklen_t" + + echocheck "network" # FIXME network check if test "$_network" = yes ; then @@ -3156,9 +3166,9 @@ EOF done fi if test "$_iconv" = yes ; then - _def_iconv='#define USE_ICONV 1' + _def_iconv='#define CONFIG_ICONV 1' else - _def_iconv='#undef USE_ICONV' + _def_iconv='#undef CONFIG_ICONV' fi echores "$_iconv" @@ -3317,10 +3327,10 @@ EOF done fi if test "$_termcap" = yes ; then - _def_termcap='#define USE_TERMCAP 1' + _def_termcap='#define CONFIG_TERMCAP 1' _res_comment="using $_ld_tmp" else - _def_termcap='#undef USE_TERMCAP' + _def_termcap='#undef CONFIG_TERMCAP' fi echores "$_termcap" @@ -5031,7 +5041,7 @@ EOF cc_check && _ossaudio=yes fi if test "$_ossaudio" = yes ; then - _def_ossaudio='#define USE_OSS_AUDIO 1' + _def_ossaudio='#define CONFIG_OSS_AUDIO 1' _aosrc="$_aosrc ao_oss.c" _aomodules="oss $_aomodules" if test "$_linux_devfs" = yes; then @@ -5060,7 +5070,7 @@ EOF _def_ossaudio_devmixer='#define PATH_DEV_MIXER "/dev/mixer"' fi else - _def_ossaudio='#undef USE_OSS_AUDIO' + _def_ossaudio='#undef CONFIG_OSS_AUDIO' _def_ossaudio_devdsp='#define PATH_DEV_DSP ""' _def_ossaudio_devmixer='#define PATH_DEV_MIXER ""' _noaomodules="oss $_noaomodules" @@ -5083,7 +5093,7 @@ cc_check `artsc-config --libs` `artsc-config --cflags` && tmp_run && _arts=yes fi if test "$_arts" = yes ; then - _def_arts='#define USE_ARTS 1' + _def_arts='#define CONFIG_ARTS 1' _aosrc="$_aosrc ao_arts.c" _aomodules="arts $_aomodules" _libs_mplayer="$_libs_mplayer `artsc-config --libs`" @@ -5110,7 +5120,7 @@ fi echores "$_esd" if test "$_esd" = yes ; then - _def_esd='#define USE_ESD 1' + _def_esd='#define CONFIG_ESD 1' _aosrc="$_aosrc ao_esd.c" _aomodules="esd $_aomodules" _libs_mplayer="$_libs_mplayer `esd-config --libs`" @@ -5124,7 +5134,7 @@ EOF cc_check `esd-config --libs` `esd-config --cflags` && _esd_latency=yes && _def_esd_latency='#define HAVE_ESD_LATENCY' echores "$_esd_latency" else - _def_esd='#undef USE_ESD' + _def_esd='#undef CONFIG_ESD' _def_esd_latency='#undef HAVE_ESD_LATENCY' _noaomodules="esd $_noaomodules" fi @@ -5145,13 +5155,13 @@ fi echores "$_pulse" if test "$_pulse" = yes ; then - _def_pulse='#define USE_PULSE 1' + _def_pulse='#define CONFIG_PULSE 1' _aosrc="$_aosrc ao_pulse.c" _aomodules="pulse $_aomodules" _libs_mplayer="$_libs_mplayer `$_pkg_config --libs libpulse`" _inc_extra="$_inc_extra `$_pkg_config --cflags libpulse`" else - _def_pulse='#undef USE_PULSE' + _def_pulse='#undef CONFIG_PULSE' _noaomodules="pulse $_noaomodules" fi @@ -5175,7 +5185,7 @@ EOF fi if test "$_jack" = yes ; then - _def_jack='#define USE_JACK 1' + _def_jack='#define CONFIG_JACK 1' _aosrc="$_aosrc ao_jack.c" _aomodules="jack $_aomodules" else @@ -5205,7 +5215,7 @@ EOF test "$_openal" = yes && _libs_mplayer="$_libs_mplayer $I" fi if test "$_openal" = yes ; then - _def_openal='#define USE_OPENAL 1' + _def_openal='#define CONFIG_OPENAL 1' _aosrc="$_aosrc ao_openal.c" _aomodules="openal $_aomodules" else @@ -5332,11 +5342,11 @@ EOF cc_check && _sunaudio=yes fi if test "$_sunaudio" = yes ; then - _def_sunaudio='#define USE_SUN_AUDIO 1' + _def_sunaudio='#define CONFIG_SUN_AUDIO 1' _aosrc="$_aosrc ao_sun.c" _aomodules="sun $_aomodules" else - _def_sunaudio='#undef USE_SUN_AUDIO' + _def_sunaudio='#undef CONFIG_SUN_AUDIO' _noaomodules="sun $_noaomodules" fi echores "$_sunaudio" @@ -5369,12 +5379,12 @@ EOF cc_check && _sgiaudio=yes fi if test "$_sgiaudio" = "yes" ; then - _def_sgiaudio='#define USE_SGI_AUDIO 1' + _def_sgiaudio='#define CONFIG_SGI_AUDIO 1' _libs_mplayer="$_libs_mplayer -laudio" _aosrc="$_aosrc ao_sgi.c" _aomodules="sgi $_aomodules" else - _def_sgiaudio='#undef USE_SGI_AUDIO' + _def_sgiaudio='#undef CONFIG_SGI_AUDIO' _noaomodules="sgi $_noaomodules" fi echores "$_sgiaudio" @@ -5431,20 +5441,20 @@ EOF fi if test "$_dvdread_internal" = yes; then - _def_dvdread_internal="#define USE_DVDREAD_INTERNAL 1" - _def_dvdread='#define USE_DVDREAD 1' + _def_dvdread_internal="#define CONFIG_DVDREAD_INTERNAL 1" + _def_dvdread='#define CONFIG_DVDREAD 1' _inputmodules="dvdread(internal) $_inputmodules" _largefiles=yes _res_comment="internal" elif test "$_dvdread" = yes; then - _def_dvdread='#define USE_DVDREAD 1' + _def_dvdread='#define CONFIG_DVDREAD 1' _largefiles=yes _ld_extra="$_ld_extra -ldvdread" _inputmodules="dvdread(external) $_inputmodules" _res_comment="external" else - _def_dvdread_internal="#undef USE_DVDREAD_INTERNAL" - _def_dvdread='#undef USE_DVDREAD' + _def_dvdread_internal="#undef CONFIG_DVDREAD_INTERNAL" + _def_dvdread='#undef CONFIG_DVDREAD' _noinputmodules="dvdread $_noinputmodules" fi echores "$_dvdread" @@ -5465,6 +5475,12 @@ if test "$_libdvdcss_internal" = yes ; then elif darwin ; then _def_dvd_darwin='#define DARWIN_DVD_IOCTL' _ld_extra="$_ld_extra -framework IOKit" + elif cygwin ; then + CFLAGS="$CFLAGS -DSYS_CYGWIN" + elif beos ; then + CFLAGS="$CFLAGS -DSYS_BEOS" + elif os2 ; then + CFLAGS="$CFLAGS -DSYS_OS2" fi _libdvdcss_dvdread_flags="-Ilibdvdcss -DHAVE_DVDCSS_DVDCSS_H" _inputmodules="libdvdcss(internal) $_inputmodules" @@ -5676,9 +5692,9 @@ EOF fi fi if test "$_ass" = yes ; then - _def_ass='#define USE_ASS' + _def_ass='#define CONFIG_ASS' else - _def_ass='#undef USE_ASS' + _def_ass='#undef CONFIG_ASS' fi echores "$_ass" @@ -5706,11 +5722,11 @@ EOF fi fi if test "$_fribidi" = yes ; then - _def_fribidi='#define USE_FRIBIDI' + _def_fribidi='#define CONFIG_FRIBIDI' _inc_extra="$_inc_extra `$_fribidiconfig --cflags`" _ld_extra="$_ld_extra `$_fribidiconfig --libs`" else - _def_fribidi='#undef USE_FRIBIDI' + _def_fribidi='#undef CONFIG_FRIBIDI' fi echores "$_fribidi" @@ -5747,10 +5763,10 @@ EOF _zlib=no cc_check -lz && _zlib=yes if test "$_zlib" = yes ; then - _def_zlib='#define HAVE_ZLIB 1' + _def_zlib='#define CONFIG_ZLIB 1' _ld_extra="$_ld_extra -lz" else - _def_zlib='#undef HAVE_ZLIB' + _def_zlib='#undef CONFIG_ZLIB' _libavdecoders=`echo $_libavdecoders | sed -e s/FLASHSV_DECODER// -e s/PNG_DECODER// -e s/ZMBV_DECODER// -e s/DXA_DECODER// ` _libavencoders=`echo $_libavencoders | sed -e s/FLASHSV_ENCODER// -e s/PNG_ENCODER// -e s/ZMBV_ENCODER// ` fi @@ -5791,11 +5807,11 @@ EOF cc_check -llzo2 && _liblzo=yes fi if test "$_liblzo" = yes ; then - _def_liblzo='#define USE_LIBLZO 1' + _def_liblzo='#define CONFIG_LIBLZO 1' _ld_extra="$_ld_extra -llzo2" _codecmodules="liblzo $_codecmodules" else - _def_liblzo='#undef USE_LIBLZO' + _def_liblzo='#undef CONFIG_LIBLZO' _nocodecmodules="liblzo $_nocodecmodules" fi echores "$_liblzo" @@ -5811,11 +5827,11 @@ EOF cc_check -lmad && _mad=yes fi if test "$_mad" = yes ; then - _def_mad='#define USE_LIBMAD 1' + _def_mad='#define CONFIG_LIBMAD 1' _ld_extra="$_ld_extra -lmad" _codecmodules="libmad $_codecmodules" else - _def_mad='#undef USE_LIBMAD' + _def_mad='#undef CONFIG_LIBMAD' _nocodecmodules="libmad $_nocodecmodules" fi echores "$_mad" @@ -5993,20 +6009,20 @@ echores "$_theora" echocheck "internal mp3lib support" if test "$_mp3lib" = yes ; then - _def_mp3lib='#define USE_MP3LIB 1' + _def_mp3lib='#define CONFIG_MP3LIB 1' _codecmodules="mp3lib $_codecmodules" else - _def_mp3lib='#undef USE_MP3LIB' + _def_mp3lib='#undef CONFIG_MP3LIB' _nocodecmodules="mp3lib $_nocodecmodules" fi echores "$_mp3lib" echocheck "internal liba52 support" if test "$_liba52" = yes ; then - _def_liba52='#define USE_LIBA52 1' + _def_liba52='#define CONFIG_LIBA52 1' _codecmodules="liba52 $_codecmodules" else - _def_liba52='#undef USE_LIBA52' + _def_liba52='#undef CONFIG_LIBA52' _nocodecmodules="liba52 $_nocodecmodules" fi echores "$_liba52" @@ -6024,10 +6040,10 @@ if test "$_libmpeg2" = auto ; then fi fi if test "$_libmpeg2" = yes ; then - _def_libmpeg2='#define USE_LIBMPEG2 1' + _def_libmpeg2='#define CONFIG_LIBMPEG2 1' _codecmodules="libmpeg2 $_codecmodules" else - _def_libmpeg2='#undef USE_LIBMPEG2' + _def_libmpeg2='#undef CONFIG_LIBMPEG2' _nocodecmodules="libmpeg2 $_nocodecmodules" fi echores "$_libmpeg2" @@ -6046,10 +6062,10 @@ EOF done fi if test "$_libdca" = yes ; then - _def_libdca='#define USE_LIBDCA 1' + _def_libdca='#define CONFIG_LIBDCA 1' _codecmodules="libdca $_codecmodules" else - _def_libdca='#undef USE_LIBDCA' + _def_libdca='#undef CONFIG_LIBDCA' _nocodecmodules="libdca $_nocodecmodules" fi echores "$_libdca" @@ -6141,7 +6157,7 @@ EOF fi if test "$_faad_internal" = yes ; then - _def_faad_internal="#define USE_FAAD_INTERNAL 1" + _def_faad_internal="#define CONFIG_FAAD_INTERNAL 1" _faad=yes _res_comment="internal floating-point" if test "$_faad_fixed" = yes ; then @@ -6154,7 +6170,7 @@ elif test "$_faad_external" = yes ; then _faad=yes _ld_extra="$_ld_extra -lfaad" else - _def_faad_internal="#undef USE_FAAD_INTERNAL" + _def_faad_internal="#undef CONFIG_FAAD_INTERNAL" _faad=no fi @@ -6214,7 +6230,7 @@ if test "$_win32dll" = auto ; then fi fi if test "$_win32dll" = yes ; then - _def_win32dll='#define USE_WIN32DLL 1' + _def_win32dll='#define CONFIG_WIN32DLL 1' test -z "$_win32codecsdir" && _win32codecsdir=$_codecsdir _res_comment="using $_win32codecsdir" if ! win32 ; then @@ -6226,7 +6242,7 @@ if test "$_win32dll" = yes ; then fi _codecmodules="win32 $_codecmodules" else - _def_win32dll='#undef USE_WIN32DLL' + _def_win32dll='#undef CONFIG_WIN32DLL' _def_win32_loader='#undef WIN32_LOADER' _nocodecmodules="win32 $_nocodecmodules" fi @@ -6243,12 +6259,12 @@ if test "$_xanim" = auto ; then fi if test "$_xanim" = yes ; then test -z "$_xanimcodecsdir" && _xanimcodecsdir=$_codecsdir - _def_xanim='#define USE_XANIM 1' + _def_xanim='#define CONFIG_XANIM 1' _def_xanim_path="#define XACODEC_PATH \"$_xanimcodecsdir\"" _codecmodules="xanim $_codecmodules" _res_comment="using $_xanimcodecsdir" else - _def_xanim='#undef USE_XANIM' + _def_xanim='#undef CONFIG_XANIM' _def_xanim_path='#undef XACODEC_PATH' _nocodecmodules="xanim $_nocodecmodules" fi @@ -6266,12 +6282,12 @@ if test "$_real" = auto ; then fi if test "$_real" = yes ; then test -z "$_realcodecsdir" && _realcodecsdir="$_codecsdir" - _def_real='#define USE_REALCODECS 1' + _def_real='#define CONFIG_REALCODECS 1' _def_real_path="#define REALCODEC_PATH \"$_realcodecsdir\"" _codecmodules="real $_codecmodules" _res_comment="using $_realcodecsdir" else - _def_real='#undef USE_REALCODECS' + _def_real='#undef CONFIG_REALCODECS' _def_real_path="#undef REALCODEC_PATH" _nocodecmodules="real $_nocodecmodules" fi @@ -6280,17 +6296,17 @@ echores "$_real" echocheck "QuickTime codecs" _qtx_emulation=no -_def_qtx_win32='#undef USE_QTX_CODECS_WIN32' +_def_qtx_win32='#undef CONFIG_QTX_CODECS_WIN32' if test "$_qtx" = auto ; then test "$_win32dll" = yes || darwin && _qtx=yes fi if test "$_qtx" = yes ; then - _def_qtx='#define USE_QTX_CODECS 1' - win32 && _qtx_codecs_win32=yes && _def_qtx_win32='#define USE_QTX_CODECS_WIN32 1' + _def_qtx='#define CONFIG_QTX_CODECS 1' + win32 && _qtx_codecs_win32=yes && _def_qtx_win32='#define CONFIG_QTX_CODECS_WIN32 1' _codecmodules="qtx $_codecmodules" darwin || win32 || _qtx_emulation=yes else - _def_qtx='#undef USE_QTX_CODECS' + _def_qtx='#undef CONFIG_QTX_CODECS' _nocodecmodules="qtx $_nocodecmodules" fi echores "$_qtx" @@ -6393,13 +6409,13 @@ EOF fi fi _libavutil=no -_def_libavutil='#undef USE_LIBAVUTIL' -_def_libavutil_a='#undef USE_LIBAVUTIL_A' -_def_libavutil_so='#undef USE_LIBAVUTIL_SO' +_def_libavutil='#undef CONFIG_LIBAVUTIL' +_def_libavutil_a='#undef CONFIG_LIBAVUTIL_A' +_def_libavutil_so='#undef CONFIG_LIBAVUTIL_SO' test "$_libavutil_a" = yes || test "$_libavutil_so" = yes && _libavutil=yes -test "$_libavutil" = yes && _def_libavutil='#define USE_LIBAVUTIL 1' -test "$_libavutil_a" = yes && _def_libavutil_a='#define USE_LIBAVUTIL_A 1' -test "$_libavutil_so" = yes && _def_libavutil_so='#define USE_LIBAVUTIL_SO 1' +test "$_libavutil" = yes && _def_libavutil='#define CONFIG_LIBAVUTIL 1' +test "$_libavutil_a" = yes && _def_libavutil_a='#define CONFIG_LIBAVUTIL_A 1' +test "$_libavutil_so" = yes && _def_libavutil_so='#define CONFIG_LIBAVUTIL_SO 1' # neither static nor shared libavutil is available, but it is mandatory ... if test "$_libavutil" = no ; then die "You need static or shared libavutil, MPlayer will not compile without!" @@ -6432,13 +6448,13 @@ EOF fi fi _libavcodec=no -_def_libavcodec='#undef USE_LIBAVCODEC' -_def_libavcodec_a='#undef USE_LIBAVCODEC_A' -_def_libavcodec_so='#undef USE_LIBAVCODEC_SO' +_def_libavcodec='#undef CONFIG_LIBAVCODEC' +_def_libavcodec_a='#undef CONFIG_LIBAVCODEC_A' +_def_libavcodec_so='#undef CONFIG_LIBAVCODEC_SO' test "$_libavcodec_a" = yes || test "$_libavcodec_so" = yes && _libavcodec=yes -test "$_libavcodec" = yes && _def_libavcodec='#define USE_LIBAVCODEC 1' -test "$_libavcodec_a" = yes && _def_libavcodec_a='#define USE_LIBAVCODEC_A 1' -test "$_libavcodec_so" = yes && _def_libavcodec_so='#define USE_LIBAVCODEC_SO 1' +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' if test "$_libavcodec_a" = yes ; then @@ -6476,14 +6492,14 @@ EOF fi fi _libavformat=no -_def_libavformat='#undef USE_LIBAVFORMAT' -_def_libavformat_a='#undef USE_LIBAVFORMAT_A' -_def_libavformat_so='#undef USE_LIBAVFORMAT_SO' +_def_libavformat='#undef CONFIG_LIBAVFORMAT' +_def_libavformat_a='#undef CONFIG_LIBAVFORMAT_A' +_def_libavformat_so='#undef CONFIG_LIBAVFORMAT_SO' test "$_libavformat_a" = yes || test "$_libavformat_so" = yes && _libavformat=yes -test "$_libavformat" = yes && _def_libavformat='#define USE_LIBAVFORMAT 1' -test "$_libavformat_a" = yes && _def_libavformat_a='#define USE_LIBAVFORMAT_A 1' +test "$_libavformat" = yes && _def_libavformat='#define CONFIG_LIBAVFORMAT 1' +test "$_libavformat_a" = yes && _def_libavformat_a='#define CONFIG_LIBAVFORMAT_A 1' test "$_libavformat_so" = yes \ - && _def_libavformat_so='#define USE_LIBAVFORMAT_SO 1' + && _def_libavformat_so='#define CONFIG_LIBAVFORMAT_SO 1' echores "$_libavformat" echocheck "FFmpeg libpostproc" @@ -6496,7 +6512,7 @@ if test "$_libpostproc_a" = auto ; then elif test "$_libpostproc_so" = auto ; then _libpostproc_so=no cat > $TMPC << EOF - #define USE_LIBPOSTPROC 1 + #define CONFIG_LIBPOSTPROC 1 #include <inttypes.h> #include <libpostproc/postprocess.h> int main(void) { pp_get_mode_by_name_and_quality("de", 0); return 0; } @@ -6508,14 +6524,14 @@ EOF fi fi _libpostproc=no -_def_libpostproc='#undef USE_LIBPOSTPROC' -_def_libpostproc_a='#undef USE_LIBPOSTPROC_A' -_def_libpostproc_so='#undef USE_LIBPOSTPROC_SO' +_def_libpostproc='#undef CONFIG_LIBPOSTPROC' +_def_libpostproc_a='#undef CONFIG_LIBPOSTPROC_A' +_def_libpostproc_so='#undef CONFIG_LIBPOSTPROC_SO' test "$_libpostproc_a" = yes || test "$_libpostproc_so" = yes && _libpostproc=yes -test "$_libpostproc" = yes && _def_libpostproc='#define USE_LIBPOSTPROC 1' -test "$_libpostproc_a" = yes && _def_libpostproc_a='#define USE_LIBPOSTPROC_A 1' +test "$_libpostproc" = yes && _def_libpostproc='#define CONFIG_LIBPOSTPROC 1' +test "$_libpostproc_a" = yes && _def_libpostproc_a='#define CONFIG_LIBPOSTPROC_A 1' test "$_libpostproc_so" = yes \ - && _def_libpostproc_so='#define USE_LIBPOSTPROC_SO 1' + && _def_libpostproc_so='#define CONFIG_LIBPOSTPROC_SO 1' echores "$_libpostproc" @@ -6850,9 +6866,9 @@ echores "$_mencoder" echocheck "fastmemcpy" # fastmemcpy check is done earlier with tests of CPU & binutils features if test "$_fastmemcpy" = yes ; then - _def_fastmemcpy='#define USE_FASTMEMCPY 1' + _def_fastmemcpy='#define CONFIG_FASTMEMCPY 1' else - _def_fastmemcpy='#undef USE_FASTMEMCPY' + _def_fastmemcpy='#undef CONFIG_FASTMEMCPY' fi echores "$_fastmemcpy" @@ -6863,19 +6879,19 @@ if test "$_unrar_exec" = auto ; then mingw32 && _unrar_exec="no" fi if test "$_unrar_exec" = yes ; then - _def_unrar_exec='#define USE_UNRAR_EXEC 1' + _def_unrar_exec='#define CONFIG_UNRAR_EXEC 1' else - _def_unrar_exec='#undef USE_UNRAR_EXEC' + _def_unrar_exec='#undef CONFIG_UNRAR_EXEC' fi echores "$_unrar_exec" echocheck "TV interface" if test "$_tv" = yes ; then - _def_tv='#define USE_TV 1' + _def_tv='#define CONFIG_TV 1' _inputmodules="tv $_inputmodules" else _noinputmodules="tv $_noinputmodules" - _def_tv='#undef USE_TV' + _def_tv='#undef CONFIG_TV' fi echores "$_tv" @@ -7063,21 +7079,21 @@ echores "$_tv_teletext" echocheck "Radio interface" if test "$_radio" = yes ; then - _def_radio='#define USE_RADIO 1' + _def_radio='#define CONFIG_RADIO 1' _inputmodules="radio $_inputmodules" if test "$_alsa9" != yes -a "$_alsa1x" != yes -a "$_ossaudio" != yes ; then _radio_capture=no fi if test "$_radio_capture" = yes ; then _audio_input=yes - _def_radio_capture="#define USE_RADIO_CAPTURE 1" + _def_radio_capture="#define CONFIG_RADIO_CAPTURE 1" else - _def_radio_capture="#undef USE_RADIO_CAPTURE" + _def_radio_capture="#undef CONFIG_RADIO_CAPTURE" fi else _noinputmodules="radio $_noinputmodules" - _def_radio='#undef USE_RADIO' - _def_radio_capture="#undef USE_RADIO_CAPTURE" + _def_radio='#undef CONFIG_RADIO' + _def_radio_capture="#undef CONFIG_RADIO_CAPTURE" _radio_capture=no fi echores "$_radio" @@ -7253,9 +7269,9 @@ echores "$_menu" echocheck "Subtitles sorting" if test "$_sortsub" = yes ; then - _def_sortsub='#define USE_SORTSUB 1' + _def_sortsub='#define CONFIG_SORTSUB 1' else - _def_sortsub='#undef USE_SORTSUB' + _def_sortsub='#undef CONFIG_SORTSUB' fi echores "$_sortsub" @@ -7589,6 +7605,51 @@ fi echores "$_maemo" fi +#this must be the last test to be performed or the ones following it will likely fail +#because libdvdnavmini is intentionally not linked against libdvdread (to permit mplayer +# to use its own copy of the library) +echocheck "DVD support (libdvdnav)" +if test "$_dvdnav" = auto ; then + if test "$_dvdread_internal" = yes ; then + _dvdnav=no + _res_comment="Disabled in favor of the internal copy of dvdread. Append --disable-dvdread-internal." + else + $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no + fi +fi +if test "$_dvdnav" = auto ; then + cat > $TMPC <<EOF +#include <inttypes.h> +#include <dvdnav/dvdnav.h> +int main(void) { dvdnav_t *dvd=0; return 0; } +EOF + _dvdnav=no + _dvdnavdir=`$_dvdnavconfig --cflags` + _dvdnavlibs=`$_dvdnavconfig --libs` + cc_check $_dvdnavdir $_dvdnavlibs $_ld_dl $_ld_pthread && _dvdnav=yes +fi +if test "$_dvdnav" = yes ; then + _largefiles=yes + _def_dvdnav='#define CONFIG_DVDNAV 1' + _inc_extra="$_inc_extra `$_dvdnavconfig --cflags`" + _ld_extra="$_ld_extra `$_dvdnavconfig --minilibs`" + _inputmodules="dvdnav $_inputmodules" +else + _def_dvdnav='#undef CONFIG_DVDNAV' + _noinputmodules="dvdnav $_noinputmodules" +fi +echores "$_dvdnav" + + +############################################################################# + +# On OS/2 nm supports only a.out. So the -Zomf compiler option to generate +# the OMF format needs to come after the 'extern symbol prefix' check, which +# uses nm. +if os2 ; then + _ld_extra="$_ld_extra -Zomf -Zstack 16384 -Zbin-files -Zargs-wild" +fi + # linker paths should be the same for mencoder and mplayer _ld_tmp="" for I in $_libs_mplayer ; do @@ -7612,10 +7673,6 @@ fi if amigaos ; then CFLAGS="$CFLAGS -DNEWLIB -D__USE_INLINE__" fi -if hpux ; then - # use flag for HPUX missing setenv() - CFLAGS="$CFLAGS -DHPUX" -fi # Thread support if linux ; then CFLAGS="$CFLAGS -D_REENTRANT" @@ -7623,30 +7680,15 @@ elif freebsd || netbsd || openbsd || bsdos ; then # FIXME bsd needs this so maybe other OS'es CFLAGS="$CFLAGS -D_THREAD_SAFE" fi -if cygwin ; then - CFLAGS="$CFLAGS -D__CYGWIN__" -fi -if os2 ; then - CFLAGS="$CFLAGS -Zomf" - ASFLAGS="$ASFLAGS -Zomf" -fi # 64 bit file offsets? if test "$_largefiles" = yes || freebsd ; then CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" if test "$_dvdread" = yes || test "$_libdvdcss_internal" = yes ; then # dvdread support requires this (for off64_t) CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE" - cygwin && CFLAGS="$CFLAGS -DSYS_CYGWIN" - beos && CFLAGS="$CFLAGS -DSYS_BEOS" - os2 && CFLAGS="$CFLAGS -DSYS_OS2" fi fi -# Make sure config.h gets included. -if test "$_dvdread_internal" = yes || test "$_faad_internal" = yes ; then - CFLAGS="$CFLAGS -DHAVE_CONFIG_H" -fi - cat > $TMPC << EOF int main(void) { return 0; } EOF @@ -7662,41 +7704,6 @@ CXXFLAGS=" $CFLAGS -D__STDC_LIMIT_MACROS" cc_check -mno-omit-leaf-frame-pointer && CFLAG_NO_OMIT_LEAF_FRAME_POINTER="-mno-omit-leaf-frame-pointer" -#this must be the last test to be performed or the ones following it will likely fail -#because libdvdnavmini is intentionally not linked against libdvdread (to permit mplayer -# to use its own copy of the library) -echocheck "DVD support (libdvdnav)" -if test "$_dvdnav" = auto ; then - if test "$_dvdread_internal" = yes ; then - _dvdnav=no - _res_comment="Disabled in favor of the internal copy of dvdread. Append --disable-dvdread-internal." - else - $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no - fi -fi -if test "$_dvdnav" = auto ; then - cat > $TMPC <<EOF -#include <inttypes.h> -#include <dvdnav/dvdnav.h> -int main(void) { dvdnav_t *dvd=0; return 0; } -EOF - _dvdnav=no - _dvdnavdir=`$_dvdnavconfig --cflags` - _dvdnavlibs=`$_dvdnavconfig --libs` - cc_check $_dvdnavdir $_dvdnavlibs $_ld_dl $_ld_pthread && _dvdnav=yes -fi -if test "$_dvdnav" = yes ; then - _largefiles=yes - _def_dvdnav='#define USE_DVDNAV 1' - _inc_extra="$_inc_extra `$_dvdnavconfig --cflags`" - _ld_extra="$_ld_extra `$_dvdnavconfig --minilibs`" - _inputmodules="dvdnav $_inputmodules" -else - _def_dvdnav='#undef USE_DVDNAV' - _noinputmodules="dvdnav $_noinputmodules" -fi -echores "$_dvdnav" - ############################################################################# echo "Creating config.mak" cat > config.mak << EOF @@ -7740,7 +7747,6 @@ CFLAG_STACKREALIGN = $_stackrealign LIBDVDCSS_DVDREAD_FLAGS = $_libdvdcss_dvdread_flags CFLAG_DHAHELPER = $cflag_dhahelper CFLAG_SVGALIB_HELPER = $cflag_svgalib_helper -ASFLAGS = $ASFLAGS EXTRALIBS = $_extra_libs EXTRA_LIB = $_ld_extra $_ld_static $_ld_lm @@ -7935,8 +7941,8 @@ HAVE_XVMC = $_xvmc DEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.h,\$^) | sed "s,[0-9a-z._-]*: \(\$(SRC_DIR)/\)*\([a-z0-9]*/\)[^/]* ,\\2&," -MPDEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.h,$^) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -MPDEPEND_CMD_CXX = \$(CC) -MM \$(CXXFLAGS) \$(filter-out %.h,$^) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," +MPDEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.h,$^) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &," +MPDEPEND_CMD_CXX = \$(CC) -MM \$(CXXFLAGS) \$(filter-out %.h,$^) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &," EOF @@ -8100,7 +8106,7 @@ $_def_mp3lame_preset_medium -stereo has three possible values (0 for stereo, 1 for left-only, 2 for right-only), with 0 being the default. */ -#define USE_FAKE_MONO 1 +#define CONFIG_FAKE_MONO 1 /* Undefine this if your sound card driver has no working select(). If you have kernel Oops, player hangups, or just no audio, you should @@ -8161,9 +8167,6 @@ $_def_kstat /* Define this if you have zlib */ $_def_zlib -#ifdef HAVE_ZLIB -#define CONFIG_ZLIB 1 -#endif /* Define this if you have shm support */ $_def_shm @@ -8199,14 +8202,6 @@ $_def_sysi86_iv /* Define this if your system has pthreads */ $_def_pthreads -/* Define this if you enabled thread support for libavcodec */ -$_def_threads -#ifdef HAVE_THREADS -#define ENABLE_THREADS 1 -#else -#define ENABLE_THREADS 0 -#endif - /* LIRC (remote control, see www.lirc.org) support: */ $_def_lirc @@ -8234,11 +8229,6 @@ $_def_dvdnav /* maximum alignment used by libmpeg2 */ #define ATTRIBUTE_ALIGNED_MAX 16 -/* Define this to enable image postprocessing in libavcodec (requires a FAST CPU!) */ -$_def_libpostproc -$_def_libpostproc_a -$_def_libpostproc_so - /* Win32 DLL support */ $_def_win32dll #define WIN32_PATH "$_win32codecsdir" @@ -8254,6 +8244,20 @@ $_def_quicktime /* Build our Win32-loader */ $_def_win32_loader +/* FFmpeg */ +/* Define this to enable image postprocessing in libavcodec (requires a FAST CPU!) */ +$_def_libpostproc +$_def_libpostproc_a +$_def_libpostproc_so + +/* Define this if you enabled thread support for libavcodec */ +$_def_threads +#ifdef HAVE_THREADS +#define ENABLE_THREADS 1 +#else +#define ENABLE_THREADS 0 +#endif + /* ffmpeg's libavcodec support (requires libavcodec source) */ $_def_libavcodec $_def_libavcodec_a @@ -8288,8 +8292,6 @@ $_def_muxers #define HAVE_EBP_AVAILABLE 1 #endif -#define HAVE_SOCKLEN_T 1 - #define CONFIG_GPL 1 #define ENABLE_SMALL 0 #define ENABLE_GRAY 0 @@ -8536,9 +8538,6 @@ $_def_enca /* liblzo support */ $_def_liblzo -#ifdef USE_LIBLZO -#define CONFIG_LZO 1 -#endif /* libmad support */ $_def_mad @@ -8584,6 +8583,12 @@ $_def_winsock2 /* define this to use inet_aton() instead of inet_pton() */ $_def_use_aton +/* socklen_t support */ +$_def_socklen_t +#ifndef HAVE_SOCKLEN_T +typedef int socklen_t; +#endif + /* enables / disables cdparanoia support */ $_def_cdparanoia $_def_cddb @@ -8631,7 +8636,6 @@ $_def_gethostbyname2 `ff_config_enable "$_cpuexts_all" "$_cpuexts" "HAVE"` $_def_altivec_h // enables usage of altivec.h -$_def_altivec_vector_braces /* libvo options */ #define SCREEN_SIZE_X 1 |