diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-05-02 00:46:03 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-05-02 00:46:03 +0300 |
| commit | 7e65428712beacd416dc3410c52f22ebfd3b4c53 (patch) | |
| tree | 79bb2f4388be7031b5505c7745e1a59aff6cff56 /configure | |
| parent | 5c4b059f1608f6d6a981b7d81a14f1c46e40ba52 (diff) | |
| parent | d0376729d171a6c0b4cc15928c168f68adefbaa6 (diff) | |
| download | mpv-7e65428712beacd416dc3410c52f22ebfd3b4c53.tar.bz2 mpv-7e65428712beacd416dc3410c52f22ebfd3b4c53.tar.xz | |
Merge branch 'mplayer1_changes'
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 20 |
1 files changed, 3 insertions, 17 deletions
@@ -296,7 +296,6 @@ Installation directories: Optional features: --disable-mplayer disable MPlayer compilation [enable] - --disable-largefiles disable support for files > 2GB [enable] --enable-termcap use termcap database for key codes [autodetect] --enable-termios use termios database for key codes [autodetect] --disable-iconv disable iconv for encoding conversion [autodetect] @@ -670,7 +669,6 @@ _xvr100=auto _tga=yes _directfb=auto _bl=no -_largefiles=yes #language=en _shm=auto _translation=no @@ -1076,8 +1074,6 @@ for ac_option do --disable-bl) _bl=no ;; --enable-mtrr) _mtrr=yes ;; --disable-mtrr) _mtrr=no ;; - --enable-largefiles) _largefiles=yes ;; - --disable-largefiles) _largefiles=no ;; --enable-shm) _shm=yes ;; --disable-shm) _shm=no ;; --enable-select) _select=yes ;; @@ -2615,7 +2611,7 @@ if arm ; then _armv6t2=no inline_asm_check '"movt r0, #0"' && _armv6t2=yes fi - echores "$_armv6" + echores "$_armv6t2" echocheck "ARM VFP" if test $_armvfp = "auto" ; then @@ -5284,11 +5280,9 @@ fi if test "$_dvdread_internal" = yes; then def_dvdread='#define CONFIG_DVDREAD 1' inputmodules="dvdread(internal) $inputmodules" - _largefiles=yes res_comment="internal" elif test "$_dvdread" = yes; then def_dvdread='#define CONFIG_DVDREAD 1' - _largefiles=yes extra_ldflags="$extra_ldflags -ldvdread" inputmodules="dvdread(external) $inputmodules" res_comment="external" @@ -5324,7 +5318,6 @@ if test "$_libdvdcss_internal" = yes ; then cflags_libdvdcss_dvdread="-Ilibdvdcss" def_dvdcss="#define HAVE_DVDCSS_DVDCSS_H 1" inputmodules="libdvdcss(internal) $inputmodules" - _largefiles=yes else noinputmodules="libdvdcss(internal) $noinputmodules" fi @@ -6600,14 +6593,8 @@ if os2 ; then 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" - fi -fi + +CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE" CXXFLAGS=" $CFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS" @@ -6637,7 +6624,6 @@ if test "$_dvdnav" = auto ; then statement_check_broken stdint.h dvdnav/dvdnav.h 'dvdnav_t *dvd = 0' $_dvdnavdir $_dvdnavlibs $_ld_dl $_ld_pthread && _dvdnav=yes fi if test "$_dvdnav" = yes ; then - _largefiles=yes def_dvdnav='#define CONFIG_DVDNAV 1' if test "$dvdnav_internal" = yes ; then cflags_libdvdnav="-Ilibdvdnav" |