aboutsummaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-05-15 18:27:58 +0200
committerMax Kellermann <max@duempel.org>2009-05-15 18:27:58 +0200
commitbad2342141d88681194fe47e08e533be4c1ab4cd (patch)
treeb4972e2b78f0036520e61f5f674c5613dfaf1e0a /m4
parentd8ef153729dfe72d84cdc3a4717a418d4883bb47 (diff)
downloadmpd-bad2342141d88681194fe47e08e533be4c1ab4cd.tar.gz
mpd-bad2342141d88681194fe47e08e533be4c1ab4cd.tar.xz
mpd-bad2342141d88681194fe47e08e533be4c1ab4cd.zip
configure.ac: removed the --disable-lametest option
The M4 function AM_PATH_LAME (m4/lame.m4) defined a configure flag named "--disable-lametest". This is redundant with configure.ac's --disable-lame-encoder, and specifying both options may break the build. Since AM_PATH_LAME is only called when the encoder plugin is enabled, we can safely remove that --disable-lametest option.
Diffstat (limited to '')
-rw-r--r--m4/lame.m49
1 files changed, 0 insertions, 9 deletions
diff --git a/m4/lame.m4 b/m4/lame.m4
index 9ba2c67a6..0723f7dba 100644
--- a/m4/lame.m4
+++ b/m4/lame.m4
@@ -18,10 +18,6 @@ AC_ARG_WITH(lame-includes,
AS_HELP_STRING([--with-lame-includes=DIR],
[directory where liblame header files are installed (optional)]),,
lame_includes="")
-AC_ARG_ENABLE(lametest,
- AS_HELP_STRING([--disable-lametest],
- [do not try to compile and run a test liblame program]),,
- enable_lametest=yes)
if test "x$lame_prefix" != "xno" ; then
@@ -47,7 +43,6 @@ if test "x$lame_prefix" != "xno" ; then
no_lame=""
- if test "x$enable_lametest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $LAME_CFLAGS"
@@ -109,10 +104,6 @@ int main ()
fi
AC_DEFINE(HAVE_LAME, 1, [Define if you have liblame.])
use_lame="1"
-else
- LAME_CFLAGS=""
- LAME_LIBS=""
-fi
AC_SUBST(LAME_CFLAGS)
AC_SUBST(LAME_LIBS)
rm -f conf.lametest