1
mirror of https://github.com/mpv-player/mpv synced 2024-08-24 07:21:49 +02:00

build: remove leftover bits for internal libdvdread support

Support for internal libdvdread has been removed in commit 41fbcee1f5,
but some bits have been missed in Makefile/configure.

Support for libdvdread as normal library is left unchanged.
This commit is contained in:
wm4 2012-08-18 10:19:37 +02:00
parent e70b5ee2fd
commit fc2ea37694
2 changed files with 0 additions and 28 deletions

View File

@ -370,10 +370,6 @@ DIRS = . \
input \
libaf \
libao2 \
libdvdcss \
libdvdnav \
libdvdnav/vm \
libdvdread4 \
libmpcodecs \
libmpcodecs/native \
libmpdemux \

24
configure vendored
View File

@ -420,8 +420,6 @@ Use these options if autodetection fails:
--extra-libs=FLAGS extra linker flags
--extra-libs-mplayer=FLAGS extra linker flags for MPlayer
--with-dvdread-config=PATH path to dvdread-config
This configure script is NOT autoconf-based, even though its output is similar.
It will try to autodetect all configuration options. If you --enable an option
it will be forcefully turned on, skipping autodetection. This can break
@ -475,7 +473,6 @@ _ladspa=auto
_libbs2b=auto
_vcd=auto
_bluray=auto
_dvdreadconfig=dvdread-config
_dvdread=auto
_live=no
_nemesi=auto
@ -567,9 +564,6 @@ for ac_option do
--with-install=*)
_install=$(echo $ac_option | cut -d '=' -f 2 )
;;
--with-dvdread-config=*)
_dvdreadconfig=$(echo $ac_option | cut -d '=' -f 2)
;;
--extra-cflags=*)
extra_cflags="$extra_cflags $(echo $ac_option | cut -d '=' -f 2-)"
@ -3492,9 +3486,6 @@ CFLAGS = $WARNFLAGS $ERRORFLAGS $WARN_CFLAGS $CFLAGS $extra_cflags
CXXFLAGS = $WARNFLAGS $ERRORFLAGS $CXXFLAGS $extra_cflags $extra_cxxflags
DEPFLAGS = $DEPFLAGS
CFLAGS_LIBDVDCSS = $cflags_libdvdcss
CFLAGS_LIBDVDCSS_DVDREAD = $cflags_libdvdcss_dvdread
EXTRALIBS = $extra_ldflags $_ld_static $_ld_lm $extra_libs
EXTRALIBS_MPLAYER = $libs_mplayer
@ -3644,21 +3635,6 @@ cat > $TMPH << EOF
$def_translation
/* definitions needed by included libraries */
#define HAVE_INTTYPES_H 1
/* libdvdcss */
#define HAVE_ERRNO_H 1
/* libdvdcss + libdvdread */
#define HAVE_LIMITS_H 1
/* libdvdcss */
#define HAVE_UNISTD_H 1
/* libdvdread */
#define STDC_HEADERS 1
#define HAVE_MEMCPY 1
/* libdvdread */
#define HAVE_DLFCN_H 1
$def_dvdcss
/* system headers */
$def_mman_h