oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

configure.ac: inherit existing TREMOR_CFLAGS and TREMOR_LIBS

Browse Source 
Replaces the old options --with-tremor-libraries and
--with-tremor-includes.
This commit is contained in:
Max Kellermann 2014-12-09 20:50:33 +01:00
parent 00aa83a498
commit 5c6f538b85
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
configure.ac
View File

@ -468,16 +468,6 @@ AC_ARG_WITH(zeroconf,
[enable zeroconf backend (default=auto)]),,
with_zeroconf="auto")
AC_ARG_WITH(tremor-libraries,
AS_HELP_STRING([--with-tremor-libraries=DIR],
[directory where Tremor library is installed (optional)]),,
tremor_libraries="")
AC_ARG_WITH(tremor-includes,
AS_HELP_STRING([--with-tremor-includes=DIR],
[directory where Tremor header files are installed (optional)]),,
tremor_includes="")
dnl ---------------------------------------------------------------------------
dnl Mandatory Libraries
dnl ---------------------------------------------------------------------------
@ -1000,6 +990,10 @@ fi
AM_CONDITIONAL(HAVE_MPCDEC, test x$enable_mpc = xyes)
dnl -------------------------------- Ogg Tremor -------------------------------
AC_ARG_VAR([TREMOR_CFLAGS], [C compiler flags for Tremor])
AC_ARG_VAR([TREMOR_LIBS], [linker flags for Tremor])
if test x$with_tremor = xyes || test x$with_tremor = xno; then
enable_tremor="$with_tremor"
tremor_prefix=""
@ -1009,17 +1003,16 @@ else
fi
if test x$enable_tremor = xyes; then
if test "x$tremor_libraries" != "x" ; then
TREMOR_LIBS="-L$tremor_libraries"
elif test "x$tremor_prefix" != "x" ; then
TREMOR_LIBS="-L$tremor_prefix/lib"
fi
TREMOR_LIBS="$TREMOR_LIBS -lvorbisidec"
if test "x$tremor_includes" != "x" ; then
TREMOR_CFLAGS="-I$tremor_includes"
elif test "x$tremor_prefix" != "x" ; then
if test x$TREMOR_CFLAGS = x && test x$tremor_prefix != x; then
TREMOR_CFLAGS="-I$tremor_prefix/include"
fi
if test x$TREMOR_LIBS = x; then
TREMOR_LIBS="-lvorbisidec"
if test x$tremor_prefix != x; then
TREMOR_LIBS="-L$tremor_prefix/lib $TREMOR_LIBS"
fi
fi
MPD_WITH_LIBRARY([TREMOR],
[AC_CHECK_FUNC([ov_read],,
@ -1033,9 +1026,6 @@ else
TREMOR_LIBS=
fi
AC_SUBST(TREMOR_CFLAGS)
AC_SUBST(TREMOR_LIBS)
dnl -------------------------------- Ogg Vorbis -------------------------------
if test x$enable_tremor = xyes; then