summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2011-04-23 15:00:43 +0000
committerUoti Urpala <uau@mplayer2.org>2011-05-02 00:36:21 +0300
commite631474c76aec7810abeda1af9d8e5b8ce8ab87b (patch)
tree78500c8215625f0d3e602b25b53f6d41458d5955 /configure
parent95d40b3f8dc4d4c7b67e3327e089a4e803f26afc (diff)
downloadmpv-e631474c76aec7810abeda1af9d8e5b8ce8ab87b.tar.bz2
mpv-e631474c76aec7810abeda1af9d8e5b8ce8ab87b.tar.xz
configure: Make largefile support non-optional
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33314 b3059339-0415-0410-9bf9-f77b7e298cf2 rpm: Delete reference to removed --enable-largefiles configure option. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33321 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: rpm/mplayer.spec
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure18
1 files changed, 2 insertions, 16 deletions
diff --git a/configure b/configure
index e4c8c9d304..0b5f61c14d 100755
--- a/configure
+++ b/configure
@@ -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 ;;
@@ -5280,11 +5276,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"
@@ -5320,7 +5314,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
@@ -6591,14 +6584,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"
@@ -6628,7 +6615,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"