From 2b1b5866346746527587b720290c32386448790b Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 20 Nov 2006 16:14:01 +0000 Subject: [PATCH] Add support for disabling MPlayer compilation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21107 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 ++ configure | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/Makefile b/Makefile index e19c3d8865..bc8ed66b74 100644 --- a/Makefile +++ b/Makefile @@ -163,7 +163,9 @@ ifeq ($(TARGET_WIN32),yes) OBJS_MPLAYER += osdep/mplayer-rc.o endif +ifeq ($(MPLAYER),yes) ALL_PRG = mplayer$(EXESUF) +endif ifeq ($(MENCODER),yes) ALL_PRG += mencoder$(EXESUF) endif diff --git a/configure b/configure index 04777a368b..1d5e84b9fa 100755 --- a/configure +++ b/configure @@ -212,6 +212,7 @@ Installation directories: Optional features: --disable-mencoder disable MEncoder (A/V encoder) compilation [enable] + --disable-mplayer disable MPlayer compilation [enable] --enable-gui enable GMPlayer compilation (GTK+ GUI) [disable] --enable-gtk1 force using GTK 1.2 for the GUI [disable] --enable-largefiles enable support for files > 2GB [disable] @@ -1561,6 +1562,7 @@ _libpostproc=auto _libpostproc_so=auto _libavcodec_mpegaudio_hp=yes _mencoder=yes +_mplayer=yes _x11=auto _xshape=auto _dga=auto # 1 2 no auto @@ -1735,6 +1737,8 @@ for ac_option do # Real 2nd pass --enable-mencoder) _mencoder=yes ;; --disable-mencoder) _mencoder=no ;; + --enable-mplayer) _mplayer=yes ;; + --disable-mplayer) _mplayer=no ;; --enable-dynamic-plugins) _dynamic_plugins=yes ;; --disable-dynamic-plugins) _dynamic_plugins=no ;; --enable-x11) _x11=yes ;; @@ -7465,6 +7469,7 @@ XVID4 = $_xvid X264 = $_x264 LIBNUT = $_nut CONFIG_DTS = $_libdts +MPLAYER = $_mplayer MENCODER = $_mencoder CDDA = $_cdda BITMAP_FONT = $_bitmap_font