summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-08-18 10:19:37 +0200
committerwm4 <wm4@nowhere>2012-08-20 15:36:02 +0200
commitfc2ea37694a6e508fe6ebc56711b11be592c7a8d (patch)
tree968993f423b422215ae08dc0e0386bc4f679a847
parente70b5ee2fde62da0e3cf969486e33c7ea37ae2b5 (diff)
downloadmpv-fc2ea37694a6e508fe6ebc56711b11be592c7a8d.tar.bz2
mpv-fc2ea37694a6e508fe6ebc56711b11be592c7a8d.tar.xz
build: remove leftover bits for internal libdvdread support
Support for internal libdvdread has been removed in commit 41fbcee1f55, but some bits have been missed in Makefile/configure. Support for libdvdread as normal library is left unchanged.
-rw-r--r--Makefile4
-rwxr-xr-xconfigure24
2 files changed, 0 insertions, 28 deletions
diff --git a/Makefile b/Makefile
index 628e2df5bc..d5a5b11b61 100644
--- a/Makefile
+++ b/Makefile
@@ -370,10 +370,6 @@ DIRS = . \
input \
libaf \
libao2 \
- libdvdcss \
- libdvdnav \
- libdvdnav/vm \
- libdvdread4 \
libmpcodecs \
libmpcodecs/native \
libmpdemux \
diff --git a/configure b/configure
index 79a965083e..0effc81147 100755
--- a/configure
+++ b/configure
@@ -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