From f6a749eff09a18a9bc0ed7a3da59f9ea0a7e9132 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 25 Jun 2004 18:11:15 +0000 Subject: JACK audio support through bio2jack by Kamil Strzelecki git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12663 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'configure') diff --git a/configure b/configure index 846ca3f1aa..3e817a2b90 100755 --- a/configure +++ b/configure @@ -255,6 +255,7 @@ Audio output: --disable-ossaudio disable OSS sound support [autodetect] --disable-arts disable aRts sound support [autodetect] --disable-esd disable esd sound support [autodetect] + --disable-jack disable JACK sound support [autodetect] --disable-nas disable NAS sound support [autodetect] --disable-sgiaudio disable SGI sound support [autodetect] --disable-sunaudio disable Sun sound support [autodetect] @@ -321,6 +322,7 @@ Use these options if autodetection fails: --with-livelibdir=DIR path to LIVE.COM Streaming Media libraries --with-xmmsplugindir=DIR path to XMMS plugins --with-xmmslibdir=DIR path to libxmms.so.1 + --with-bio2jack=DIR path to libbio2jack.a (e.g. /home/user/bio2jack) --with-cdparanoiaincdir=DIR cdparanoia headers in DIR --with-cdparanoialibdir=DIR cdparanoia libraries (libcdda_*) in DIR --with-termcaplib=NAME name of library with termcap functionality @@ -1171,6 +1173,7 @@ _rtc=auto _ossaudio=auto _arts=auto _esd=auto +_jack=auto _liblzo=auto _mad=auto _vorbis=auto @@ -1337,6 +1340,8 @@ for ac_option do --disable-arts) _arts=no ;; --enable-esd) _esd=yes ;; --disable-esd) _esd=no ;; + --enable-jack) _jack=yes ;; + --disable-jack) _jack=no ;; --enable-mad) _mad=yes ;; --disable-mad) _mad=no ;; --enable-liblzo) _liblzo=yes ;; @@ -1546,6 +1551,10 @@ for ac_option do --with-xmmsplugindir=*) _xmmsplugindir=`echo $ac_option | cut -d '=' -f 2` ;; + + --with-bio2jack=*) + _bio2jackdir=`echo $ac_option | cut -d '=' -f 2` + ;; --enable-profile) _profile='-p' @@ -4101,6 +4110,41 @@ else _noaomodules="esd $_noaomodules" fi + +echocheck "JACK" +if test "$_jack" = auto ; then + _jack=no + if ( ( pkg-config --modversion jack ) > /dev/null 2>&1 ) && + ( jackd --version | grep version | awk '{ print $3 }' ) >> "$TMPLOG" 2>&1 ; then + +cat > $TMPC << EOF +#include +int main(void) { JACK_Init(); return 0; } +EOF + if test -z "$_bio2jackdir" ; then + cc_check -lbio2jack `pkg-config --libs --cflags jack` && ( "$TMPO" >> "$TMPLOG" 2>&1 ) && _jack=yes + else + cc_check -L "$_bio2jackdir" -lbio2jack `pkg-config --libs --cflags jack` && ( "$TMPO" >> "$TMPLOG" 2>&1 ) && _jack=yes + fi + fi +fi + +if test "$_jack" = yes ; then + _def_jack='#define USE_JACK 1' + _aosrc="$_aosrc ao_jack.c" + _aomodules="jack $_aomodules" + if test -z "$_bio2jackdir" ; then + _ld_jack="-lbio2jack `pkg-config --libs jack`" + else + _ld_jack="-L \"$_bio2jackdir\" -lbio2jack `pkg-config --libs jack`" + fi + _inc_jack=`pkg-config --cflags jack` +else + _noaomodules="jack $_noaomodules" +fi +echores "$_jack" + + echocheck "ALSA audio" if test "$_alsa" != no ; then _alsa=no @@ -6094,6 +6138,8 @@ ARTS_LIB = $_ld_arts ARTS_INC = $_inc_arts ESD_LIB = $_ld_esd ESD_INC = $_inc_esd +JACK_LIB = $_ld_jack +JACK_INC = $_inc_jack SGIAUDIO_LIB = $_ld_sgiaudio # input/demuxer/codecs @@ -6495,6 +6541,7 @@ $_def_alsa1x $_def_arts $_def_esd $_def_esd_latency +$_def_jack $_def_sys_asoundlib_h $_def_alsa_asoundlib_h $_def_sunaudio -- cgit v1.2.3