Handle af_ladspa conditional compilation in the usual way.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26373 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-04-09 17:23:59 +00:00
parent 27d308ae44
commit 0ce6d08a83
2 changed files with 3 additions and 9 deletions

10
configure vendored
View File

@ -6202,11 +6202,8 @@ EOF
fi fi
if test "$_ladspa" = yes; then if test "$_ladspa" = yes; then
_def_ladspa="#define HAVE_LADSPA" _def_ladspa="#define HAVE_LADSPA"
_afsrc="$_afsrc af_ladspa.c"
_afmodules="ladspa $_afmodules"
else else
_def_ladspa="#undef HAVE_LADSPA" _def_ladspa="#undef HAVE_LADSPA"
_noafmodules="ladspa $_noafmodules"
fi fi
echores "$_ladspa" echores "$_ladspa"
@ -7756,6 +7753,8 @@ ALSA5 = $_alsa5
ALSA9 = $_alsa9 ALSA9 = $_alsa9
ALSA1X = $_alsa1x ALSA1X = $_alsa1x
LADSPA = $_ladspa
# input/demuxer/codecs # input/demuxer/codecs
JOYSTICK = $_joystick JOYSTICK = $_joystick
LIRC = $_lirc LIRC = $_lirc
@ -7851,9 +7850,6 @@ VO_SRCS = $_vosrc
# --- libao2 stuff --- # --- libao2 stuff ---
AO_SRCS = $_aosrc AO_SRCS = $_aosrc
# --- libaf stuff ---
AF_SRCS = $_afsrc
# FFmpeg # FFmpeg
LIBAVUTIL = $_libavutil LIBAVUTIL = $_libavutil
LIBAVUTIL_A = $_libavutil_a LIBAVUTIL_A = $_libavutil_a
@ -8686,13 +8682,11 @@ cat << EOF
Codecs: $_codecmodules Codecs: $_codecmodules
Audio output: $_aomodules Audio output: $_aomodules
Video output: $_vomodules Video output: $_vomodules
Audio filters: $_afmodules
Disabled optional drivers: Disabled optional drivers:
Input: $_noinputmodules Input: $_noinputmodules
Codecs: $_nocodecmodules Codecs: $_nocodecmodules
Audio output: $_noaomodules Audio output: $_noaomodules
Video output: $_novomodules Video output: $_novomodules
Audio filters: $_noafmodules
'config.h' and 'config.mak' contain your configuration options. 'config.h' and 'config.mak' contain your configuration options.
Note: If you alter theses files (for instance CFLAGS) MPlayer may no longer Note: If you alter theses files (for instance CFLAGS) MPlayer may no longer

View File

@ -28,9 +28,9 @@ SRCS_COMMON = af.c \
format.c \ format.c \
reorder_ch.c \ reorder_ch.c \
window.c \ window.c \
$(AF_SRCS) \
SRCS_COMMON-$(HAVE_SYS_MMAN_H) += af_export.c SRCS_COMMON-$(HAVE_SYS_MMAN_H) += af_export.c
SRCS_COMMON-$(LADSPA) += af_ladspa.c
SRCS_COMMON-$(LIBAVCODEC) += af_lavcresample.c SRCS_COMMON-$(LIBAVCODEC) += af_lavcresample.c
SRCS_COMMON-$(LIBAVCODEC_A) += af_lavcac3enc.c SRCS_COMMON-$(LIBAVCODEC_A) += af_lavcac3enc.c