adam
/
darkice
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed issue with compiling with jack installed at arbitrary locations, 

fixes #14
This commit is contained in:
darkeye 2007-03-05 20:21:38 +00:00
parent 2b6725d452
commit abd9574ce7
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
darkice/trunk/ChangeLog
View File

@ -16,6 +16,7 @@ DarkIce next release
Mariusz Mazur <mmazur@kernel.pl> Mariusz Mazur <mmazur@kernel.pl>
o fix to enable file dump feature using ogg vorbis. o fix to enable file dump feature using ogg vorbis.
thanks to dsk <derrick@csociety.org> thanks to dsk <derrick@csociety.org>
o fix to enable compiling with jack installed at arbitrary locations
19-05-2006 DarkIce 0.17.1 released 19-05-2006 DarkIce 0.17.1 released

30
darkice/trunk/configure.in
View File

@ -234,17 +234,33 @@ dnl-----------------------------------------------------------------------------
dnl link JACK sound server if requested dnl link JACK sound server if requested
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
AC_SUBST(JACK_CFLAGS) AC_SUBST(JACK_CFLAGS)
AC_SUBST(JACK_LIBS) AC_SUBST(JACK_LDFLAGS)
AC_ARG_WITH( jack, AC_ARG_WITH(jack,
[ --with-jack use JACK audio server [yes] ], [ --with-jack use JACK sound system [yes] ],
USE_JACK=${withval}, USE_JACK="yes" ) USE_JACK=${withval}, USE_JACK="yes" )
AC_ARG_WITH(jack-prefix,
[ --with-jack-prefix=DIR alternate location for JACK [/usr]
look for libraries in JACK-PREFIX/lib,
for headers in JACK-PREFIX/include],
CONFIG_JACK_PREFIX="${withval}", CONFIG_JACK_PREFIX="/usr")
if test "x${USE_JACK}" = "xyes" ; then if test "x${USE_JACK}" = "xyes" ; then
PKG_CHECK_MODULES(JACK, jack, AC_MSG_CHECKING( [for jack libraries at ${CONFIG_JACK_PREFIX}] )
[ AC_DEFINE( HAVE_JACK_LIB, 1, [build with JACK audio server support] ) ], LA_SEARCH_LIB( JACK_LIB_LOC, JACK_INC_LOC, libjack.so, jack/jack.h,
[ HAVE_JACK_LIB=0 ] ${CONFIG_JACK_PREFIX})
)
if test "x${JACK_LIB_LOC}" != "x" ; then
AC_DEFINE( HAVE_JACK_LIB, 1, [build with JACK audio server support] )
if test "x${JACK_INC_LOC}" != "x${SYSTEM_INCLUDE}" ; then
JACK_INCFLAGS="-I${JACK_INC_LOC}"
fi
JACK_LDFLAGS="-L${JACK_LIB_LOC} -ljack"
AC_MSG_RESULT( [found at ${CONFIG_JACK_PREFIX}] )
else
AC_MSG_WARN( [not found, building without JACK support])
fi
else else
AC_MSG_RESULT( [building without JACK support] ) AC_MSG_RESULT( [building without JACK support] )
fi fi

2
darkice/trunk/src/Makefile.am
View File

@ -3,7 +3,7 @@ AM_CXXFLAGS = -O2 -pedantic -Wall @DEBUG_CXXFLAGS@ @PTHREAD_CFLAGS@
@JACK_CFLAGS@ @JACK_CFLAGS@
INCLUDES = @LAME_INCFLAGS@ @VORBIS_INCFLAGS@ @FAAC_INCFLAGS@ @TWOLAME_INCFLAGS@ @ALSA_INCFLAGS@ INCLUDES = @LAME_INCFLAGS@ @VORBIS_INCFLAGS@ @FAAC_INCFLAGS@ @TWOLAME_INCFLAGS@ @ALSA_INCFLAGS@
LDADD = @PTHREAD_LIBS@ @LAME_LDFLAGS@ @VORBIS_LDFLAGS@ @FAAC_LDFLAGS@ @TWOLAME_LDFLAGS@ \ LDADD = @PTHREAD_LIBS@ @LAME_LDFLAGS@ @VORBIS_LDFLAGS@ @FAAC_LDFLAGS@ @TWOLAME_LDFLAGS@ \
@ALSA_LDFLAGS@ @JACK_LIBS@ @ALSA_LDFLAGS@ @JACK_LDFLAGS@
darkice_SOURCES = AudioEncoder.h\ darkice_SOURCES = AudioEncoder.h\
AudioSource.h\ AudioSource.h\