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

configure.ac: Move Ogg Tremor to Decoder Plugins, add header.

Browse Source
This commit is contained in:
Avuton Olrich
2010-04-17 03:47:13 -07:00
parent 39b37d547c
commit 263a968c2b
1 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
configure.ac
View File

@@ -175,6 +175,11 @@ AC_ARG_ENABLE(fluidsynth,
[enable MIDI support via fluidsynth (default: disable)]),, [enable MIDI support via fluidsynth (default: disable)]),,
enable_fluidsynth=no) enable_fluidsynth=no)
AC_ARG_ENABLE(gme,
AS_HELP_STRING([--enable-gme],
[enable Blargg's game music emulator plugin]),,
enable_gme=auto)
AC_ARG_ENABLE(gprof, AC_ARG_ENABLE(gprof,
AS_HELP_STRING([--enable-gprof], AS_HELP_STRING([--enable-gprof],
[enable profiling via gprof (default: disabled)]),, [enable profiling via gprof (default: disabled)]),,
@@ -690,7 +695,6 @@ fi
AM_CONDITIONAL(ENABLE_ARCHIVE, test x$enable_archive = xyes) AM_CONDITIONAL(ENABLE_ARCHIVE, test x$enable_archive = xyes)
dnl dnl
dnl metadata dnl metadata
dnl dnl
@@ -713,17 +717,9 @@ dnl ###
AC_ARG_ENABLE(gme,
AS_HELP_STRING([--enable-gme],
[enable Blargg's game music emulator plugin]),,
enable_gme=auto)
MPD_AUTO_PKG(gme, GME, [libgme],
[gme decoder plugin], [libgme not found])
AM_CONDITIONAL(HAVE_GME, test x$enable_gme = xyes)
if test x$enable_gme = xyes; then
AC_DEFINE(HAVE_GME, 1, [Define for gme support])
fi
AC_ARG_ENABLE(mpc, AC_ARG_ENABLE(mpc,
AS_HELP_STRING([--disable-mpc], AS_HELP_STRING([--disable-mpc],
@@ -761,17 +757,6 @@ if test x$enable_sndfile = xyes; then
fi fi
dnl ###
dnl Ogg Tremor
dnl ###
if test x$with_tremor = xyes || test x$with_tremor = xno; then
use_tremor="$with_tremor"
else
tremor_prefix="$with_tremor"
use_tremor=yes
fi
found_sidplay=$HAVE_CXX found_sidplay=$HAVE_CXX
MPD_AUTO_PRE(sidplay, [sidplay decoder plugin], [No C++ compiler found]) MPD_AUTO_PRE(sidplay, [sidplay decoder plugin], [No C++ compiler found])
@@ -1002,6 +987,14 @@ fi
AM_CONDITIONAL(ENABLE_FLUIDSYNTH, test x$enable_fluidsynth = xyes) AM_CONDITIONAL(ENABLE_FLUIDSYNTH, test x$enable_fluidsynth = xyes)
dnl ---------------------------------- libgme ---------------------------------
MPD_AUTO_PKG(gme, GME, [libgme],
[gme decoder plugin], [libgme not found])
AM_CONDITIONAL(HAVE_GME, test x$enable_gme = xyes)
if test x$enable_gme = xyes; then
AC_DEFINE(HAVE_GME, 1, [Define for gme support])
fi
dnl ---------------------------------- libmad --------------------------------- dnl ---------------------------------- libmad ---------------------------------
MPD_AUTO_PKG(mad, MAD, [mad], MPD_AUTO_PKG(mad, MAD, [mad],
[libmad MP3 decoder plugin], [libmad not found]) [libmad MP3 decoder plugin], [libmad not found])
@@ -1119,7 +1112,13 @@ fi
AM_CONDITIONAL(HAVE_MPCDEC, test x$enable_mpc = xyes) AM_CONDITIONAL(HAVE_MPCDEC, test x$enable_mpc = xyes)
dnl -------------------------------- Ogg Tremor -------------------------------
if test x$with_tremor = xyes || test x$with_tremor = xno; then
use_tremor="$with_tremor"
else
tremor_prefix="$with_tremor"
use_tremor=yes
fi
if test x$use_tremor = xyes; then if test x$use_tremor = xyes; then
if test "x$tremor_libraries" != "x" ; then if test "x$tremor_libraries" != "x" ; then