summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-08-28 16:09:31 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-08-28 16:09:31 +0000
commit0dbb552406e2637e8c43a0229573ace0f736fa9b (patch)
tree166b5367b577100a3305d4a88b95438c2da43326 /configure
parent0b03ca9d27df2576fc2026389d3d60abacd3808f (diff)
downloadmpv-0dbb552406e2637e8c43a0229573ace0f736fa9b.tar.bz2
mpv-0dbb552406e2637e8c43a0229573ace0f736fa9b.tar.xz
final (?) libvo2 cleanup patch by Joey Parrish
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7113 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure22
1 files changed, 1 insertions, 21 deletions
diff --git a/configure b/configure
index 533ccc749d..36b500bb06 100755
--- a/configure
+++ b/configure
@@ -19,8 +19,7 @@
#
# GOTCHAS:
# - config files are currently:
-# config.h config.mak libvo/config.mak libao2/config.mak
-# Gui/config.mak libvo2/config.mak
+# config.h config.mak libvo/config.mak libao2/config.mak Gui/config.mak
#
#############################################################################
@@ -970,7 +969,6 @@ _tdfxfb=no
_directfb=auto
_zr=auto
_largefiles=no
-_vo2=no
_language=en
_shm=auto
_linux_devfs=no
@@ -1128,8 +1126,6 @@ for ac_option do
--disable-mtrr) _mtrr=no ;;
--enable-largefiles) _largefiles=yes ;;
--disable-largefiles) _largefiles=no ;;
- --enable-vo2) _vo2=yes ;;
- --disable-vo2) _vo2=no ;;
--enable-shm) _shm=yes ;;
--disable-shm) _shm=no ;;
--enable-select) _select=yes ;;
@@ -4211,8 +4207,6 @@ VIDIX = $_vidix
OPENDIVX = $_opendivx
-VO2 = $_vo2
-
PNG = $_mkf_png
JPEG = $_mkf_jpg
GIF = $_mkf_gif
@@ -4708,20 +4702,6 @@ EOF
#############################################################################
-if test -d "libvo2" ; then
-
-echo "Creating libvo2/config.mak"
-_vo2obj=`echo $_vo2src | sed -e 's/\.c/\.o/g'`
-cat > libvo2/config.mak << EOF
-include ../config.mak
-OPTIONAL_SRCS = $_vo2src
-OPTIONAL_OBJS = $_vo2obj
-EOF
-
-fi
-
-#############################################################################
-
echo "Creating libao2/config.mak"
_aoobj=`echo $_aosrc | sed -e 's/\.c/\.o/g'`
cat > libao2/config.mak << EOF